From bf2f76e6b3a4b4eabd969e4d1bdc68c3c92002c5 Mon Sep 17 00:00:00 2001
From: Kevin Broch <kbroch@rivosinc.com>
Date: Tue, 5 Nov 2024 20:50:20 -0800
Subject: [PATCH] remove duplicate org which broke then combined one

---
 projects/rvi-repo-manifest/Makefile               |  9 ++++-----
 .../rvi-repo-manifest/generated/all-rvi-orgs.xml  | 15 +++++++--------
 .../rvi-repo-manifest/generated/riscv-admin.xml   |  2 +-
 .../generated/riscv-software-src.xml              |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/projects/rvi-repo-manifest/Makefile b/projects/rvi-repo-manifest/Makefile
index 986a11d..079b7bc 100644
--- a/projects/rvi-repo-manifest/Makefile
+++ b/projects/rvi-repo-manifest/Makefile
@@ -1,13 +1,12 @@
 
 ORGS := \
-        riscv-collab \
-		riscv-software-src \
 		riscv \
-		riscv-non-isa \
 		riscv-admin \
-		riscv-software-src \
+		riscv-android-src \
 		riscv-collab \
-		riscv-android-src
+		riscv-non-isa \
+		riscv-software-src \
+        riscv-collab
 
 TOOL := ./generate-manifests.sh
 BUILD_DIR := generated
diff --git a/projects/rvi-repo-manifest/generated/all-rvi-orgs.xml b/projects/rvi-repo-manifest/generated/all-rvi-orgs.xml
index 18b94ed..a9f8f06 100644
--- a/projects/rvi-repo-manifest/generated/all-rvi-orgs.xml
+++ b/projects/rvi-repo-manifest/generated/all-rvi-orgs.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-<include name="riscv-collab.xml" />
-<include name="riscv-software-src.xml" />
-<include name="riscv.xml" />
-<include name="riscv-non-isa.xml" />
-<include name="riscv-admin.xml" />
-<include name="riscv-software-src.xml" />
-<include name="riscv-collab.xml" />
-<include name="riscv-android-src.xml" />
+    <include name="riscv.xml" />
+    <include name="riscv-admin.xml" />
+    <include name="riscv-android-src.xml" />
+    <include name="riscv-collab.xml" />
+    <include name="riscv-non-isa.xml" />
+    <include name="riscv-software-src.xml" />
+    <include name="riscv-collab.xml" />
 </manifest>
diff --git a/projects/rvi-repo-manifest/generated/riscv-admin.xml b/projects/rvi-repo-manifest/generated/riscv-admin.xml
index 15bea21..149b266 100644
--- a/projects/rvi-repo-manifest/generated/riscv-admin.xml
+++ b/projects/rvi-repo-manifest/generated/riscv-admin.xml
@@ -3,6 +3,7 @@
 <!-- https://gerrit.googlesource.com/git-repo/+/master/docs/manifest-format.md -->
 <manifest>
     <include name="_common.xml" />
+    <project name='riscv-admin/docs-sig' revision='main' groups='riscv-admin' />
     <project name='riscv-admin/riscv-landscape' revision='main' groups='riscv-admin' />
     <project name='riscv-admin/composable-custom-extensions' revision='main' groups='riscv-admin' />
     <project name='riscv-admin/help' revision='main' groups='riscv-admin' />
@@ -36,7 +37,6 @@
     <project name='riscv-admin/external-debug-security' revision='main' groups='riscv-admin' />
     <project name='riscv-admin/template-docs-rtd' revision='main' groups='riscv-admin' />
     <project name='riscv-admin/.github' revision='main' groups='riscv-admin' />
-    <project name='riscv-admin/docs-sig' revision='main' groups='riscv-admin' />
     <project name='riscv-admin/app-tools-software' revision='master' groups='riscv-admin' />
     <project name='riscv-admin/riscv-brs' revision='main' groups='riscv-admin' />
     <project name='riscv-admin/riscv-memory-tagging' revision='main' groups='riscv-admin' />
diff --git a/projects/rvi-repo-manifest/generated/riscv-software-src.xml b/projects/rvi-repo-manifest/generated/riscv-software-src.xml
index 00fc51b..fed95f5 100644
--- a/projects/rvi-repo-manifest/generated/riscv-software-src.xml
+++ b/projects/rvi-repo-manifest/generated/riscv-software-src.xml
@@ -3,10 +3,10 @@
 <!-- https://gerrit.googlesource.com/git-repo/+/master/docs/manifest-format.md -->
 <manifest>
     <include name="_common.xml" />
+    <project name='riscv-software-src/riscv-isa-sim' revision='master' groups='riscv-software-src' />
     <project name='riscv-software-src/riscv-unified-db' revision='main' groups='riscv-software-src' />
     <project name='riscv-software-src/librpmi' revision='main' groups='riscv-software-src' />
     <project name='riscv-software-src/riscv-perf-model' revision='master' groups='riscv-software-src' />
-    <project name='riscv-software-src/riscv-isa-sim' revision='master' groups='riscv-software-src' />
     <project name='riscv-software-src/riscv-tests' revision='master' groups='riscv-software-src' />
     <project name='riscv-software-src/opensbi' revision='master' groups='riscv-software-src' />
     <project name='riscv-software-src/homebrew-riscv' revision='main' groups='riscv-software-src' />