summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2017-08-31 13:37:01 -0700
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-09-27 11:02:04 +0200
commitaf6ac8a85139becc2e33c29152306190998cf9bf (patch)
tree4d0cedc1510d32d794c3f165c0cf5444c714029b
parentbacd77224e74b0fa466bc0f1c707672135b8035c (diff)
manifest: move to top of branches
Let repo use top of (morty) branch of all repositories we use and use top of morty-next branch of all Toradex repositories. Also remove head-default.xml since it was outdated anyways. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--default.xml36
-rw-r--r--head-default.xml24
2 files changed, 18 insertions, 42 deletions
diff --git a/default.xml b/default.xml
index d37d0a2..140ff91 100644
--- a/default.xml
+++ b/default.xml
@@ -13,24 +13,24 @@
<default sync-j="4"/>
- <project name="bitbake.git" path="layers/openembedded-core/bitbake" remote="oe" revision="bdf7a362ecdafd47f309b7a21feac4b94624f287" upstream="1.32"/>
- <project name="meta-angstrom.git" path="layers/meta-angstrom" remote="githa" revision="709abee819ee349dab873f6abb02c404b2c65331" upstream="angstrom-v2016.12-yocto2.2"/>
- <project name="meta-browser.git" path="layers/meta-browser" remote="githo" revision="ee0d264347ca89efe73788a11f31504d1d42b716" upstream="morty"/>
- <project name="meta-freescale-3rdparty.git" path="layers/meta-freescale-3rdparty" remote="githf" revision="1879485e63ce369292c89b5902ff6df13509090b" upstream="morty"/>
- <project name="meta-freescale-distro.git" path="layers/meta-freescale-distro" remote="githf" revision="cd5c7a2539f40004f74126e9fdf08254fd9a6390" upstream="morty"/>
- <project name="meta-freescale.git" path="layers/meta-freescale" remote="githf" revision="fa774ad7fb797957601a8c9fee45af453fea34b7" upstream="morty"/>
- <project name="meta-jetson-tk1.git" path="layers/meta-jetson-tk1" remote="githt" revision="e8b87fe8da7c6fcffa37ab245f50082953cc1ee1" upstream="Morty"/>
- <project name="meta-linaro.git" path="layers/meta-linaro" remote="linaro" revision="e5b6b4e20a489bd7f39a9053f84914e318aea199" upstream="morty"/>
- <project name="meta-lxde.git" path="layers/meta-lxde" remote="tdx" revision="1bd36a4d0f7e1e9fdea9c4c991188bc1dc9da421" upstream="morty"/>
- <project name="meta-openembedded.git" path="layers/meta-openembedded" remote="oe" revision="fe5c83312de11e80b85680ef237f8acb04b4b26e" upstream="morty"/>
- <project name="meta-qt4" path="layers/meta-qt4" remote="yocto" revision="2c7f8df9039be498f8a2232d1428adb7f4e5e800" upstream="morty"/>
- <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="3601fd2c5306ac6d5d0d536e0be8cbb90da9b4c1" upstream="morty"/>
- <project name="meta-snappy.git" path="layers/meta-snappy" remote="giths" revision="f6df6a63756d9976bcccb5fefdbc64e5cc794c99" upstream="master"/>
- <project name="meta-toradex-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="b128af95613557af8deaea30212e89e6316eab88" upstream="morty"/>
- <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="9776575a1a4b243f3a80de22bd16ea6a9525912d" upstream="morty">
+ <project name="bitbake.git" path="layers/openembedded-core/bitbake" remote="oe" revision="1.32"/>
+ <project name="meta-angstrom.git" path="layers/meta-angstrom" remote="githa" revision="angstrom-v2016.12-yocto2.2"/>
+ <project name="meta-browser.git" path="layers/meta-browser" remote="githo" revision="morty"/>
+ <project name="meta-freescale-3rdparty.git" path="layers/meta-freescale-3rdparty" remote="githf" revision="morty"/>
+ <project name="meta-freescale-distro.git" path="layers/meta-freescale-distro" remote="githf" revision="morty"/>
+ <project name="meta-freescale.git" path="layers/meta-freescale" remote="githf" revision="morty"/>
+ <project name="meta-jetson-tk1.git" path="layers/meta-jetson-tk1" remote="githt" revision="Morty"/>
+ <project name="meta-linaro.git" path="layers/meta-linaro" remote="linaro" revision="morty"/>
+ <project name="meta-lxde.git" path="layers/meta-lxde" remote="tdx" revision="morty"/>
+ <project name="meta-openembedded.git" path="layers/meta-openembedded" remote="oe" revision="morty"/>
+ <project name="meta-qt4" path="layers/meta-qt4" remote="yocto" revision="morty"/>
+ <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="morty"/>
+ <project name="meta-snappy.git" path="layers/meta-snappy" remote="giths" revision="master"/>
+ <project name="meta-toradex-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="morty-next"/>
+ <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="morty-next">
<copyfile dest="export" src="buildconf/export"/>
</project>
- <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="89a17628efef01fd5af202e88d79188df08f636f" upstream="morty"/>
- <project name="meta-toradex-tegra.git" path="layers/meta-toradex-tegra" remote="tdx" revision="40e9d4bd596a01df7fccd305befc362a08117f9f" upstream="morty"/>
- <project name="openembedded-core.git" path="layers/openembedded-core" remote="oe" revision="4c353eeff45f91533f22392f129bc5a477ee5207" upstream="morty"/>
+ <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="morty-next"/>
+ <project name="meta-toradex-tegra.git" path="layers/meta-toradex-tegra" remote="tdx" revision="morty-next"/>
+ <project name="openembedded-core.git" path="layers/openembedded-core" remote="oe" revision="morty-next"/>
</manifest>
diff --git a/head-default.xml b/head-default.xml
deleted file mode 100644
index 700c275..0000000
--- a/head-default.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
- <remote fetch="http://github.com" name="gith"/>
- <remote fetch="http://git.linaro.org/git-ro/openembedded" name="linaro"/>
- <remote fetch="http://git.openembedded.org" name="oe"/>
- <remote fetch="http://git.toradex.com" name="trdx"/>
- <remote fetch="http://git.yoctoproject.org" name="yocto"/>
-
- <default sync-j="4"/>
-
- <project name="Angstrom-distribution/meta-angstrom.git" path="stuff/meta-angstrom" remote="gith" revision="angstrom-v2014.06-yocto1.6" upstream="angstrom-v2014.06-yocto1.6"/>
- <project name="Freescale/meta-fsl-arm-extra.git" path="stuff/meta-fsl-arm-extra" remote="gith" revision="daisy" upstream="daisy"/>
- <project name="Freescale/meta-fsl-arm.git" path="stuff/meta-fsl-arm" remote="gith" revision="daisy" upstream="daisy"/>
- <project name="Freescale/meta-fsl-demos.git" path="stuff/meta-fsl-demos" remote="gith" revision="daisy" upstream="daisy"/>
- <project name="OSSystems/meta-browser.git" path="stuff/meta-browser" remote="gith" revision="master" upstream="master"/>
- <project name="bitbake" path="stuff/openembedded-core/bitbake" remote="oe" revision="1.22" upstream="1.22"/>
- <project name="meta-linaro.git" path="stuff/meta-linaro" remote="linaro" revision="daisy" upstream="daisy"/>
- <project name="meta-lxde.git" path="stuff/meta-lxde" remote="trdx" revision="daisy" upstream="daisy"/>
- <project name="meta-openembedded" path="stuff/meta-openembedded" remote="oe" revision="daisy" upstream="daisy"/>
- <project name="meta-toradex.git" path="stuff/meta-toradex" remote="trdx" revision="V2.3" upstream="V2.3">
- <copyfile dest="export" src="buildconf/export"/>
- </project>
- <project name="openembedded-core" path="stuff/openembedded-core" remote="oe" revision="daisy" upstream="daisy"/>
-</manifest>