From bcc532e5142c40d15e9bb2c7f10e02c37a45d507 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 15 Jun 2015 14:10:05 +0300 Subject: Include tzdata and ntp tools to image Including cities from americas, asia and europe. Change-Id: I7cedb056d450d9aae36543fce5510822ab731694 Task-number: QTEE-921 Reviewed-by: aavit --- conf/bblayers.conf.bbb.sample | 2 ++ conf/bblayers.conf.emulator.sample | 2 ++ conf/bblayers.conf.fsl.sample | 2 ++ conf/bblayers.conf.rpi.sample | 2 ++ conf/bblayers.conf.ti.sample | 2 ++ conf/bblayers.conf.tibidabo.sample | 2 ++ conf/bblayers.conf.toradex.sample | 2 ++ recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 4 ++++ recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | 1 + 9 files changed, 19 insertions(+) diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample index d4ffbc4..e2d95d3 100644 --- a/conf/bblayers.conf.bbb.sample +++ b/conf/bblayers.conf.bbb.sample @@ -34,6 +34,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-beagleboard/common-bsp \ ${BSPDIR}/sources/meta-ti \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample index 43ce7d3..1e65b47 100644 --- a/conf/bblayers.conf.emulator.sample +++ b/conf/bblayers.conf.emulator.sample @@ -32,6 +32,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ ${BSPDIR}/sources/poky/meta-yocto \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample index dd84362..71c3a2f 100644 --- a/conf/bblayers.conf.fsl.sample +++ b/conf/bblayers.conf.fsl.sample @@ -34,6 +34,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample index 0866e3e..2cee63a 100644 --- a/conf/bblayers.conf.rpi.sample +++ b/conf/bblayers.conf.rpi.sample @@ -33,6 +33,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta-yocto \ ${BSPDIR}/sources/meta-raspberrypi \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample index 7fc2d6b..be4d670 100644 --- a/conf/bblayers.conf.ti.sample +++ b/conf/bblayers.conf.ti.sample @@ -33,6 +33,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta-yocto \ ${BSPDIR}/sources/meta-ti \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample index 20d049d..e827ae3 100644 --- a/conf/bblayers.conf.tibidabo.sample +++ b/conf/bblayers.conf.tibidabo.sample @@ -35,6 +35,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-tibidabo \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-b2qt \ ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample index c724636..e0a77f6 100644 --- a/conf/bblayers.conf.toradex.sample +++ b/conf/bblayers.conf.toradex.sample @@ -35,6 +35,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-toradex \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index c5078c2..3dfc1a5 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -54,6 +54,10 @@ RDEPENDS_${PN} = "\ otf-noto \ libmysqlclient \ libpq \ + tzdata \ + tzdata-americas \ + tzdata-asia \ + tzdata-europe \ ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ ${MACHINE_EXTRA_INSTALL} \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb index 85c3b6e..351a752 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb @@ -33,4 +33,5 @@ RDEPENDS_${PN} = "\ i2c-tools \ perf \ htop \ + ntp \ " -- cgit v1.2.3-54-g00ecf