summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2014-09-02 12:02:44 +0300
committerSamuli Piippo <samuli.piippo@digia.com>2014-09-17 09:22:34 +0300
commit5a54785b5d3789bb95b9c852d60ac0f9204ccc4f (patch)
treed649e89285433c425e56044f93286cd1f6766e5f
parent8d903f5cd379e8c45f64c985393498ae03234d93 (diff)
downloadmeta-boot2qt-5a54785b5d3789bb95b9c852d60ac0f9204ccc4f.tar.gz
Update upstream meta layers and add meta-beagleboard
Change-Id: Ifc65774898f728920e4b8314bfc71cfbe13a0eb9 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
-rwxr-xr-xb2qt-init-build-env15
-rw-r--r--conf/bblayers.conf.sample1
-rw-r--r--conf/local.conf.sample2
3 files changed, 10 insertions, 8 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index e1f34fc..29657a0 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -52,13 +52,14 @@ checkout() {
52 fi 52 fi
53} 53}
54 54
55checkout git://git.yoctoproject.org/poky "daisy:b0ce70ffa820c8b4069bdb413f7aa9db668b9428" 55checkout git://git.yoctoproject.org/poky "daisy:b2f045c400fa8bd20b319c60137b1575f967cef1"
56checkout git://git.yoctoproject.org/meta-fsl-arm "daisy:f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b" 56checkout git://git.yoctoproject.org/meta-fsl-arm "daisy:e9bf647e10ff1e31f911d3236dbb22a1ad7ace9f"
57checkout git://github.com/Freescale/meta-fsl-arm-extra "daisy:6c3871ea5b0ec358e978814b5b38cef40d8dcbbc" 57checkout git://github.com/Freescale/meta-fsl-arm-extra "daisy:e041d9a118c5eecf4010bcb41bb5c554636090ab"
58checkout git://git.yoctoproject.org/meta-ti "daisy:5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66" 58checkout git://git.yoctoproject.org/meta-ti "daisy:41457c50e21168faf04f3cdd4168954890d6cdab"
59checkout git://git.yoctoproject.org/meta-raspberrypi "daisy:cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55" 59checkout git://github.com/beagleboard/meta-beagleboard "master:b5c709b2b6bd3bf236df923fa8f245a00fbb1b60"
60checkout git://git.toradex.com/meta-toradex "V2.2:371ea626f29a2a12294ab6ea30e36743a9e2f78f" 60checkout git://git.yoctoproject.org/meta-raspberrypi "daisy:946b69299737cc2f1378c864f1b9075280db1b53"
61checkout git://git.openembedded.org/meta-openembedded "daisy:a6dcf6265822ca1484d991d10a3042e04a960cdb" 61checkout git://git.toradex.com/meta-toradex "V2.2:b47dad6cf9bd5be5287dac3835ea037a2fd30cf7"
62checkout git://git.openembedded.org/meta-openembedded "daisy:662cf409c1175450699d498085f3c894e0fe81d0"
62 63
63if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then 64if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then
64 ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt 65 ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 9789ceb..666d9ab 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -33,6 +33,7 @@ BBLAYERS ?= " \
33 ##COREBASE##/meta-fsl-arm \ 33 ##COREBASE##/meta-fsl-arm \
34 ##COREBASE##/meta-fsl-arm-extra \ 34 ##COREBASE##/meta-fsl-arm-extra \
35 ##COREBASE##/meta-ti \ 35 ##COREBASE##/meta-ti \
36 ##COREBASE##/meta-beagleboard/common-bsp \
36 ##COREBASE##/meta-raspberrypi \ 37 ##COREBASE##/meta-raspberrypi \
37 ##COREBASE##/meta-toradex \ 38 ##COREBASE##/meta-toradex \
38 ##COREBASE##/meta-openembedded/meta-oe \ 39 ##COREBASE##/meta-openembedded/meta-oe \
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 3874397..9b24789 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -276,7 +276,7 @@ CONF_VERSION = "1"
276INHERIT += "rm_work" 276INHERIT += "rm_work"
277 277
278BBMASK = "meta-ti/recipes-misc" 278BBMASK = "meta-ti/recipes-misc"
279BBMASK += "|meta-toradex/recipes/images|meta-toradex/recipes-browser|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes-mozilla|meta-toradex/recipes-graphics|meta-toradex/recipes-devtools/mtd|meta-toradex/recipes-core/psplash|meta-toradex/recipes-lxde|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes/trdx-config|meta-toradex/recipes-core/util-linux|meta-toradex/recipes-core/systemd|meta-toradex/recipes-support|meta-toradex/recipes-core/dropbear|meta-toradex/recipes/base-files|meta-toradex/recipes-multimedia/gstreamer" 279BBMASK += "|meta-toradex/recipes/images|meta-toradex/recipes-browser|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes-mozilla|meta-toradex/recipes-graphics|meta-toradex/recipes-devtools/mtd|meta-toradex/recipes-core/psplash|meta-toradex/recipes-lxde|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes/trdx-config|meta-toradex/recipes-core/util-linux|meta-toradex/recipes-core/systemd|meta-toradex/recipes-support|meta-toradex/recipes-core/dropbear|meta-toradex/recipes/base-files|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-qt"
280ACCEPT_FSL_EULA = "1" 280ACCEPT_FSL_EULA = "1"
281LICENSE_FLAGS_WHITELIST = "commercial" 281LICENSE_FLAGS_WHITELIST = "commercial"
282 282