diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-15 14:10:05 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-08-06 06:54:15 +0000 |
commit | bcc532e5142c40d15e9bb2c7f10e02c37a45d507 (patch) | |
tree | ea879edee8310340d086b8cbcd77b4e0c161b81d | |
parent | 6783e66644cb9f9f6f909ab7e16cc45684e71418 (diff) | |
download | meta-boot2qt-bcc532e5142c40d15e9bb2c7f10e02c37a45d507.tar.gz |
Include tzdata and ntp tools to image
Including cities from americas, asia and europe.
Change-Id: I7cedb056d450d9aae36543fce5510822ab731694
Task-number: QTEE-921
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
-rw-r--r-- | conf/bblayers.conf.bbb.sample | 2 | ||||
-rw-r--r-- | conf/bblayers.conf.emulator.sample | 2 | ||||
-rw-r--r-- | conf/bblayers.conf.fsl.sample | 2 | ||||
-rw-r--r-- | conf/bblayers.conf.rpi.sample | 2 | ||||
-rw-r--r-- | conf/bblayers.conf.ti.sample | 2 | ||||
-rw-r--r-- | conf/bblayers.conf.tibidabo.sample | 2 | ||||
-rw-r--r-- | conf/bblayers.conf.toradex.sample | 2 | ||||
-rw-r--r-- | recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 4 | ||||
-rw-r--r-- | recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | 1 |
9 files changed, 19 insertions, 0 deletions
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 ?= " \ | |||
34 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ | 34 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ |
35 | ${BSPDIR}/sources/meta-ti \ | 35 | ${BSPDIR}/sources/meta-ti \ |
36 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 36 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
37 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
38 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
37 | ${BSPDIR}/sources/meta-qt5 \ | 39 | ${BSPDIR}/sources/meta-qt5 \ |
38 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ | 40 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ |
39 | ${BSPDIR}/sources/meta-b2qt \ | 41 | ${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 ?= " \ | |||
32 | ${BSPDIR}/sources/poky/meta \ | 32 | ${BSPDIR}/sources/poky/meta \ |
33 | ${BSPDIR}/sources/poky/meta-yocto \ | 33 | ${BSPDIR}/sources/poky/meta-yocto \ |
34 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 34 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
35 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
36 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
35 | ${BSPDIR}/sources/meta-qt5 \ | 37 | ${BSPDIR}/sources/meta-qt5 \ |
36 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ | 38 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ |
37 | ${BSPDIR}/sources/meta-b2qt \ | 39 | ${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 ?= " \ | |||
34 | ${BSPDIR}/sources/meta-fsl-arm \ | 34 | ${BSPDIR}/sources/meta-fsl-arm \ |
35 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | 35 | ${BSPDIR}/sources/meta-fsl-arm-extra \ |
36 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 36 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
37 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
38 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
37 | ${BSPDIR}/sources/meta-qt5 \ | 39 | ${BSPDIR}/sources/meta-qt5 \ |
38 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ | 40 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ |
39 | ${BSPDIR}/sources/meta-b2qt \ | 41 | ${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 ?= " \ | |||
33 | ${BSPDIR}/sources/poky/meta-yocto \ | 33 | ${BSPDIR}/sources/poky/meta-yocto \ |
34 | ${BSPDIR}/sources/meta-raspberrypi \ | 34 | ${BSPDIR}/sources/meta-raspberrypi \ |
35 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 35 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
36 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
37 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
36 | ${BSPDIR}/sources/meta-qt5 \ | 38 | ${BSPDIR}/sources/meta-qt5 \ |
37 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ | 39 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ |
38 | ${BSPDIR}/sources/meta-b2qt \ | 40 | ${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 ?= " \ | |||
33 | ${BSPDIR}/sources/poky/meta-yocto \ | 33 | ${BSPDIR}/sources/poky/meta-yocto \ |
34 | ${BSPDIR}/sources/meta-ti \ | 34 | ${BSPDIR}/sources/meta-ti \ |
35 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 35 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
36 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
37 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
36 | ${BSPDIR}/sources/meta-qt5 \ | 38 | ${BSPDIR}/sources/meta-qt5 \ |
37 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ | 39 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ |
38 | ${BSPDIR}/sources/meta-b2qt \ | 40 | ${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 ?= " \ | |||
35 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | 35 | ${BSPDIR}/sources/meta-fsl-arm-extra \ |
36 | ${BSPDIR}/sources/meta-tibidabo \ | 36 | ${BSPDIR}/sources/meta-tibidabo \ |
37 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 37 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
38 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
39 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
38 | ${BSPDIR}/sources/meta-qt5 \ | 40 | ${BSPDIR}/sources/meta-qt5 \ |
39 | ${BSPDIR}/sources/meta-b2qt \ | 41 | ${BSPDIR}/sources/meta-b2qt \ |
40 | ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ | 42 | ${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 ?= " \ | |||
35 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | 35 | ${BSPDIR}/sources/meta-fsl-arm-extra \ |
36 | ${BSPDIR}/sources/meta-toradex \ | 36 | ${BSPDIR}/sources/meta-toradex \ |
37 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 37 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
38 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
39 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
38 | ${BSPDIR}/sources/meta-qt5 \ | 40 | ${BSPDIR}/sources/meta-qt5 \ |
39 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ | 41 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ |
40 | ${BSPDIR}/sources/meta-b2qt \ | 42 | ${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} = "\ | |||
54 | otf-noto \ | 54 | otf-noto \ |
55 | libmysqlclient \ | 55 | libmysqlclient \ |
56 | libpq \ | 56 | libpq \ |
57 | tzdata \ | ||
58 | tzdata-americas \ | ||
59 | tzdata-asia \ | ||
60 | tzdata-europe \ | ||
57 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ | 61 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ |
58 | ${MACHINE_EXTRA_INSTALL} \ | 62 | ${MACHINE_EXTRA_INSTALL} \ |
59 | " | 63 | " |
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} = "\ | |||
33 | i2c-tools \ | 33 | i2c-tools \ |
34 | perf \ | 34 | perf \ |
35 | htop \ | 35 | htop \ |
36 | ntp \ | ||
36 | " | 37 | " |