simply down to 1 manifest; add proj group

default.xml

@@ -1 +1 @@
-projects/rvi-repo-manifest/generated/all-rvi-orgs.xml
+projects/rvi-repo-manifest/generated/default.xml

projects/rvi-repo-manifest/Makefile

@@ -9,29 +9,24 @@ ORGS := \
 
 TOOL := ./generate-manifests.sh
 BUILD_DIR := generated
-ALL_ORGS_XML := all-rvi-orgs.xml
+ALL_ORGS_XML := default.xml
 
 ORGS_XML := $(addsuffix .xml, $(ORGS))
 
 .PHONY: build-xml build-all-rvi-orgs-xml
 
-default: build-xml $(ALL_ORGS_XML)
+all: $(ALL_ORGS_XML)
 
 build-xml:
 	$(MAKE) $(ORGS_XML)
 
-all-orgs-xml:
+$(ALL_ORGS_XML):
 	$(TOOL) $(BUILD_DIR)/$(ALL_ORGS_XML) $(ORGS)
-	cp _common.xml $(BUILD_DIR)/.
 
 %.xml:
 	$(TOOL) $(BUILD_DIR)/$@ $*
-	cp _common.xml $(BUILD_DIR)/.
 
 clean:
-	rm -rf $(BUILD_DIR/*.xml)
-
-clean-all:
 	rm -rf $(BUILD_DIR)
 
 # Debug variables

projects/rvi-repo-manifest/README.adoc

@@ -25,14 +25,28 @@ Although manifest files can be created manually, a bash script is used here to d
 
 ==== Using git `repo` tool
 
+===== `repo init`
+
 Similarly to cloning a single repo, the first step in using `repo` is to link:https://source.android.com/docs/setup/reference/repo#init[initialize] a directory with the configuration (manifest file).  This should be done in an empty dir.
 
+There is only one `default.xml` manifest file that has been created.  It contains all the projects of all the orgs that RVI uses.  To filter down by organization or projects, use the `--groups=` feature of the `repo init` command.
+
+Here's an example:
 [source, bash]
 ----
 mkdir rvi-repos && cd rvi-repos
-repo init -u https://github.com/riscv-admin/docs-sig -g all,-riscv-android-src
+repo init -u https://github.com/riscv-admin/docs-sig --groups=all,-org:riscv-android-src
 ----
 
+NOTES:
+* If a `--manifest` isn't provided, `default.xml` is assumed
+* `--groups=all` is a special group to check out all
+* If a `-` is used in front of a group, negates its use
+
+==== `repo sync`
+
+After `repo init` is done once, `repo sync` can be used to clone the initial repos and keep them sync'ed with upstream in the future.
+
 === Pros and cons
 
 * Pros

projects/rvi-repo-manifest/generate-manifests.sh

@@ -41,7 +41,8 @@ xml_header='<?xml version="1.0" encoding="UTF-8"?>
 <!-- GENERATED FILE DO NOT EDIT -->
 <!-- https://gerrit.googlesource.com/git-repo/+/master/docs/manifest-format.md -->
 <manifest>
-    <include name="_common.xml" />'
+    <remote name="origin" fetch="ssh://[email protected]"/>
+    <default revision="refs/heads/main" remote="origin" sync-j="4"/>'
 
 echo "$xml_header" > "$output_file"
 
@@ -50,7 +51,7 @@ for org in $org_list; do
     echo "Fetching repositories for organization: $org"
 
     # Get list of repositories for the organization
-    repos=$(gh repo list -L $MAX_REPOS --no-archived --source $org --json name --jq '.[].name')
+    repos=$(gh repo list -L $MAX_REPOS --no-archived --source $org --json name --jq '.[].name' | sort)
 
     # Loop through each repository
     for repo in $repos; do
@@ -60,7 +61,7 @@ for org in $org_list; do
         default_branch=$(echo $repo_info | jq -r '.db')
 
         # Add repository information to the XML file
-        repo_entry="    <project name='$org/$repo' revision='$default_branch' groups='$org' />"
+        repo_entry="    <project name='$org/$repo' revision='$default_branch' groups='org:$org,proj:$repo' />"
         echo "$repo_entry" >> $output_file
     done
 done