Paste in mendel.xml to columbia.xml instead of including
- The manifest parser on the build servers doesn't handle the use of
remove-project, so we get errors. For now, paste the contents of
mendel.xml into columbia.xml, with modified revisions as needed. After
nothing from mendel.xml is forked, we can revert to an include.
Change-Id: I01cedaa8c03f37557f474786563ccf20b2421d87
diff --git a/columbia.xml b/columbia.xml
index 07464f8..c1d9cd3 100644
--- a/columbia.xml
+++ b/columbia.xml
@@ -1,7 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
- <include name="mendel.xml"/>
+ <!-- BEGIN mendel.xml -->
+ <!--
+ Copied in on 10/21/2019, when projects from here no longer require a fork,
+ revert to including mendel.xml.
+ -->
+ <remote fetch="https://coral.googlesource.com" name="coral"
+ review="https://coral-review.googlesource.com" />
+ <remote fetch="sso://aiyprojects" name="coral-internal"
+ review="sso://aiyprojects" />
+
+ <default remote="coral" revision="master" />
+
+ <project name="manifest" path="manifest" />
+
+ <project name="docs" path="docs">
+ <linkfile src="GettingStarted.md" dest="GettingStarted.md" />
+ </project>
+
+ <!-- BEGIN Build system -->
+ <project name="build" path="build" revision="columbia" >
+ <linkfile src="Makefile" dest="Makefile" />
+ </project>
+ <!-- END Build system -->
+
+ <!-- BEGIN Misc Tools repos -->
+ <project path="tools/bpt" name="bpt" />
+ <project path="tools/img2simg" name="img2simg" />
+ <project path="tools/mdt" name="mdt" />
+ <project path="tools/busybox" name="busybox" />
+ <!-- END Misc Tools repos -->
+
+ <!-- BEGIN Package repos -->
+ <project path="packages/base-files" name="base-files" />
+ <project path="packages/mdt-services" name="mdt-services" />
+ <project path="packages/mendel-distro-info-data" name="mendel-distro-info-data" />
+ <project path="packages/mendel-keyring" name="mendel-keyring" />
+ <project path="packages/mendel-minimal" name="mendel-minimal" />
+ <project path="packages/meta-mendel" name="meta-mendel" />
+ <project path="packages/runonce" name="runonce" />
+ <project path="packages/usb-gadget" name="usb-gadget" />
+ <project path="packages/vitalsd" name="vitalsd" />
+ <!-- END Package repos -->
+ <!-- END mendel.xml -->
<!-- BEGIN prebuilts -->
<project path="prebuilts" name="prebuilts" />
@@ -12,11 +54,6 @@
<project path="packages/imx-mkimage" name="imx-mkimage-debian" />
<!-- END imx specific build tools -->
- <!-- BEGIN columbia-specific forks -->
- <remove-project name="build" />
- <project name ="build" path="build" revision="columbia" />
- <!-- END columbia-specific forks -->
-
<!-- BEGIN imx BSP build config -->
<project name="board-columbia" path="board" />
<!-- END imx BSP build config -->
