diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-30 23:43:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:53:00 +0100 |
commit | 86d4bb2c3ed24843a3e0bdacc91e49b57943c9fb (patch) | |
tree | 8c219eacf95dd0a4841fb645143ba6b188a0d2c3 | |
parent | e5f7edf0d6d2d1f6cb4187af9d75d7dd57de134b (diff) | |
download | poky-86d4bb2c3ed24843a3e0bdacc91e49b57943c9fb.tar.gz |
packagegroup-core-qt: rename -demos to -demoapps
Try to avoid confusion with the Qt demos distributed with Qt itself.
(From OE-Core rev: dbbcc0cb9d2cbc66027c800075b94eb9b7110a00)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/core-image.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-core-qt.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index a23d3c8c7e..6a391d5925 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass | |||
@@ -37,7 +37,7 @@ PACKAGE_GROUP_nfs-server = "packagegroup-core-nfs-server" | |||
37 | PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" | 37 | PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" |
38 | PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh" | 38 | PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh" |
39 | PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" | 39 | PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" |
40 | PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demos" | 40 | PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demoapps" |
41 | 41 | ||
42 | 42 | ||
43 | # IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2' | 43 | # IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2' |
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb index 579ca15f29..d59cb4bc0d 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb | |||
@@ -8,8 +8,8 @@ PR = "r3" | |||
8 | 8 | ||
9 | inherit packagegroup | 9 | inherit packagegroup |
10 | 10 | ||
11 | PACKAGES = "${PN}-demos" | 11 | PACKAGES = "${PN}-demoapps" |
12 | 12 | ||
13 | QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" | 13 | QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" |
14 | 14 | ||
15 | RDEPENDS_${PN}-demos = "${QTDEMOS}" | 15 | RDEPENDS_${PN}-demoapps = "${QTDEMOS}" |