summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-08-04 11:40:59 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2014-08-04 12:28:18 +0200
commit26fa4d8c0a006e9dbc24e9f1ede075c7cd5e7682 (patch)
tree1b2a1b18c4e8547180bc644f95be5c966ca177fa
parent600afe7598ea365d5677e00ee55d97f321e134b1 (diff)
manifest: update to use daisy branches
Change-Id: Icfd6a7f904cd380227df2d8e1dbd8f07a0c78a52
-rw-r--r--default.xml44
-rw-r--r--head-default.xml36
2 files changed, 38 insertions, 42 deletions
diff --git a/default.xml b/default.xml
index e0e112d..4d3baf6 100644
--- a/default.xml
+++ b/default.xml
@@ -1,26 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
-
- <default sync-j="4"/>
-
- <remote fetch="http://git.openembedded.org" name="oe"/>
- <remote fetch="http://github.com" name="gith"/>
- <remote fetch="http://git.yoctoproject.org" name="yocto"/>
- <remote fetch="http://git.linaro.org/git-ro/openembedded" name="linaro"/>
- <remote fetch="http://git.toradex.com" name="trdx"/>
-
- <project remote="oe" revision="3bb3f1823bdd46ab34577d43f1e39046a32bca77" upstream="1.20" name="bitbake" path="stuff/openembedded-core/bitbake"/>
- <project remote="oe" revision="4c58fe468790822fe48e0a570779979c831d0f10" upstream="dora" name="openembedded-core" path="stuff/openembedded-core"/>
- <project remote="oe" revision="ee173678383683e972c7d4d6f0ef5790bfa50274" upstream="dora" name="meta-openembedded" path="stuff/meta-openembedded"/>
- <project remote="gith" revision="6e77d2ad81a9266bf28cfba769d30346d8007f06" upstream="angstrom-v2013.12-yocto1.5" name="Angstrom-distribution/meta-angstrom.git" path="stuff/meta-angstrom"/>
- <project remote="gith" revision="c94a11b2f0811961f56b75c699f299d3d90ecf1a" upstream="dora" name="OSSystems/meta-browser.git" path="stuff/meta-browser"/>
- <project remote="linaro" revision="503b1fe68f90a8e2b43c456ddd17a0a90816cf9c" upstream="dora" name="meta-linaro.git" path="stuff/meta-linaro"/>
- <project remote="trdx" revision="8f47ef38f225a77aa79b217d35d88543d7d7603f" upstream="dora" name="meta-lxde.git" path="stuff/meta-lxde"/>
- <project remote="gith" revision="5fdb620c09df11e70434092f675c891e0ba84108" upstream="dora" name="Freescale/meta-fsl-arm.git" path="stuff/meta-fsl-arm"/>
- <project remote="gith" revision="375f89b70655be2a17bbde36de6adb4e4a5a6975" upstream="dora" name="Freescale/meta-fsl-arm-extra.git" path="stuff/meta-fsl-arm-extra"/>
- <project remote="gith" revision="5a12677ad000a926d23c444266722a778ea228a7" upstream="dora" name="Freescale/meta-fsl-demos.git" path="stuff/meta-fsl-demos"/>
- <project remote="trdx" revision="b974d25cfc11d448a0b60012db60a2095fc72f80" upstream="V2.2" name="meta-toradex.git" path="stuff/meta-toradex">
- <copyfile dest="export" src="buildconf/export"/>
- </project>
-
+ <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="a455a433bc70ed100d534082d152c5e8dd74e2d1" upstream="angstrom-v2014.06-yocto1.6"/>
+ <project name="Freescale/meta-fsl-arm-extra.git" path="stuff/meta-fsl-arm-extra" remote="gith" revision="456c27085a70bb1385a4c2e28ba80ac74d6f533e" upstream="daisy"/>
+ <project name="Freescale/meta-fsl-arm.git" path="stuff/meta-fsl-arm" remote="gith" revision="5cc4f08776a6d0f91ca6d7fb409e64c99333e137" upstream="daisy"/>
+ <project name="Freescale/meta-fsl-demos.git" path="stuff/meta-fsl-demos" remote="gith" revision="27fdb2f2642ecd55d5633bde880dd4c37acd0d42" upstream="daisy"/>
+ <project name="OSSystems/meta-browser.git" path="stuff/meta-browser" remote="gith" revision="fb6df963376c9140658c09b763bbf524cd274db4" upstream="master"/>
+ <project name="bitbake" path="stuff/openembedded-core/bitbake" remote="oe" revision="8e386a710023e000a504e05c13da0106df0c7f3a" upstream="1.22"/>
+ <project name="meta-linaro.git" path="stuff/meta-linaro" remote="linaro" revision="610ff67118ae495d284626895243fb3c3c42835d" upstream="daisy"/>
+ <project name="meta-lxde.git" path="stuff/meta-lxde" remote="trdx" revision="d5a2a2c4552164009d6199d3767aa598e67c4c40" upstream="daisy"/>
+ <project name="meta-openembedded" path="stuff/meta-openembedded" remote="oe" revision="d85b01997ce8cc354ccc53f97fdffc79cf2277d5" upstream="daisy"/>
+ <project name="meta-toradex.git" path="stuff/meta-toradex" remote="trdx" revision="2987c851e107648b3ce28cdad5447c2f0cb6be02" upstream="V2.3">
+ <copyfile dest="export" src="buildconf/export"/>
+ </project>
+ <project name="openembedded-core" path="stuff/openembedded-core" remote="oe" revision="9c45575a9df01f0d36fb03120ec86d55b15819f3" upstream="daisy"/>
</manifest>
diff --git a/head-default.xml b/head-default.xml
index c2bb5fc..700c275 100644
--- a/head-default.xml
+++ b/head-default.xml
@@ -1,26 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
-
- <default sync-j="4"/>
-
- <remote fetch="http://git.openembedded.org" name="oe"/>
<remote fetch="http://github.com" name="gith"/>
- <remote fetch="http://git.yoctoproject.org" name="yocto"/>
<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"/>
-
- <project remote="oe" revision="1.20" upstream="1.20" name="bitbake" path="stuff/openembedded-core/bitbake"/>
- <project remote="oe" revision="dora" upstream="dora" name="openembedded-core" path="stuff/openembedded-core"/>
- <project remote="oe" revision="dora" upstream="dora" name="meta-openembedded" path="stuff/meta-openembedded"/>
- <project remote="gith" revision="angstrom-v2013.12-yocto1.5" upstream="angstrom-v2013.12-yocto1.5" name="Angstrom-distribution/meta-angstrom.git" path="stuff/meta-angstrom"/>
- <project remote="gith" revision="dora" upstream="dora" name="OSSystems/meta-browser.git" path="stuff/meta-browser"/>
- <project remote="linaro" revision="dora" upstream="dora" name="meta-linaro.git" path="stuff/meta-linaro"/>
- <project remote="trdx" revision="dora" upstream="dora" name="meta-lxde.git" path="stuff/meta-lxde"/>
- <project remote="gith" revision="dora" upstream="dora" name="Freescale/meta-fsl-arm.git" path="stuff/meta-fsl-arm"/>
- <project remote="gith" revision="dora" upstream="dora" name="Freescale/meta-fsl-arm-extra.git" path="stuff/meta-fsl-arm-extra"/>
- <project remote="gith" revision="dora" upstream="dora" name="Freescale/meta-fsl-demos.git" path="stuff/meta-fsl-demos"/>
- <project remote="trdx" revision="V2.2" upstream="V2.2" name="meta-toradex.git" path="stuff/meta-toradex">
- <copyfile dest="export" src="buildconf/export"/>
+ <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>