Merge "jenkins: Integrate the jenkins CI/CD repo into the source tree"
diff --git a/columbia.xml b/columbia.xml
index 3bc6a28..8f8a2c1 100644
--- a/columbia.xml
+++ b/columbia.xml
@@ -1,19 +1,61 @@
<?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" >
+ <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" />
<!-- END prebuilts -->
<!-- BEGIN imx specific build tools -->
- <project path="tools/imx-mkimage" name="imx-mkimage" revision="imx_4.9.123_imx8mm_ga" />
+ <project path="tools/imx-mkimage" name="imx-mkimage" revision="rel_imx_4.19.35_1.0.0" />
<project path="packages/imx-mkimage" name="imx-mkimage-debian" />
<!-- END imx specific build tools -->
<!-- BEGIN imx BSP build config -->
- <project name="board-enterprise" path="board" />
+ <project name="board-columbia" path="board" />
<!-- END imx BSP build config -->
<!-- BEGIN imx bootloader -->
@@ -22,14 +64,14 @@
<!-- END imx bootloader -->
<!-- BEGIN imx linux -->
- <project name="linux-imx" path="linux-imx" revision="4.14.98" />
- <project name="linux-imx-debian" path="packages/linux-imx" revision="4.14.98" />
+ <project name="linux-imx" path="linux-imx" />
+ <project name="linux-imx-debian" path="packages/linux-imx" />
<!-- END imx linux -->
<project name="libdrm-imx" path="libdrm-imx" />
<project name="libdrm-imx-debian" path="packages/libdrm-imx" />
<project name="imx-firmware" path="imx-firmware" />
- <project name="imx-firmware-debian" path="packages/imx-firmware" />
+ <project name="imx-firmware-debian" path="packages/imx-firmware" revision="columbia" />
<project name="imx-atf" path="imx-atf" revision="imx_4.9.123_imx8mm_ga" />
<project name="imx-atf-debian" path="packages/imx-atf" />
@@ -39,7 +81,7 @@
<project path="imx-gst-plugins-good" name="imx-gst-plugins-good" />
<project path="imx-gst-plugins-bad" name="imx-gst-plugins-bad" />
<project path="imx-gst1.0-plugin" name="imx-gst1.0-plugin" />
- <project path="packages/imx-board-tools" name="imx-board-tools" />
+ <project path="packages/imx-board-tools" name="imx-board-tools" revision="columbia" />
<project path="packages/imx-gstreamer" name="imx-gstreamer-debian" />
<project path="packages/imx-gst-plugins-base" name="imx-gst-plugins-base-debian" />
<project path="packages/imx-gst-plugins-good" name="imx-gst-plugins-good-debian" />
@@ -55,14 +97,12 @@
<project path="bluez-imx" name="bluez-imx" />
<project path="packages/bluez-imx" name="bluez-imx-debian" />
- <project path="packages/edgetpu" name="edgetpu" />
<project path="packages/edgetpuvision" name="edgetpuvision" />
<project path="packages/edgetpudemo" name="edgetpudemo" />
<project path="packages/imx-board-audio" name="imx-board-audio" />
- <project path="packages/imx-board-wlan" name="imx-board-wlan" />
- <project path="packages/meta-enterprise" name="meta-enterprise" />
+ <project path="packages/meta-columbia" name="meta-columbia" />
<!-- END imx specific repos -->
<project path="a71ch-crypto-support" name="a71ch-crypto-support"
@@ -86,5 +126,7 @@
<project name="imx-vpuwrap-debian" path="packages/imx-vpuwrap"
groups="notdefault,internal" remote="coral-internal" />
+ <project name="kokoro-columbia" path="kokoro"
+ groups="notdefault,internal" remote="coral-internal" />
<!-- END closed source repositories -->
</manifest>
diff --git a/mendel.xml b/mendel.xml
index 4fd9311..07d8d23 100644
--- a/mendel.xml
+++ b/mendel.xml
@@ -19,6 +19,7 @@
<project name="build" path="build">
<linkfile src="Makefile" dest="Makefile" />
</project>
+ <project name="releases" path="releases" />
<!-- END Build system -->
<!-- BEGIN Misc Tools repos -->
