diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-07-26 18:16:14 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:52:57 +0100 |
commit | 9bb6f42763d7c3aa4d59ac08b2b4252d2e2b00a2 (patch) | |
tree | 43b3913030dff1ed7d0949bc1adc13df60a7f2ed /meta/recipes-sato/packagegroups | |
parent | 073a12c9cbedd210499835d608d98005251f7d6a (diff) | |
download | poky-9bb6f42763d7c3aa4d59ac08b2b4252d2e2b00a2.tar.gz |
packagegroup-*: change to inherit from packagegroup.bbclass
Also clean out items already handled by that class (dev/dbg packages,
ALLOW_EMPTY, etc.)
(From OE-Core rev: 65fca4458cfe1d647c7ea1d4588dc449739a73eb)
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>
Diffstat (limited to 'meta/recipes-sato/packagegroups')
3 files changed, 4 insertions, 22 deletions
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb index 4f3bb47000..432d99d0ca 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb | |||
@@ -8,18 +8,12 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 | |||
8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
9 | PR = "r1" | 9 | PR = "r1" |
10 | 10 | ||
11 | PACKAGES = "\ | 11 | inherit packagegroup |
12 | packagegroup-core-x11-mini \ | ||
13 | packagegroup-core-x11-mini-dbg \ | ||
14 | packagegroup-core-x11-mini-dev \ | ||
15 | " | ||
16 | 12 | ||
17 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 13 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
18 | 14 | ||
19 | XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" | 15 | XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" |
20 | 16 | ||
21 | ALLOW_EMPTY = "1" | ||
22 | |||
23 | ROOTLESS_X = "1" | 17 | ROOTLESS_X = "1" |
24 | 18 | ||
25 | # xserver-common, x11-common | 19 | # xserver-common, x11-common |
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index 380584e223..f38e0d2800 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | |||
@@ -8,16 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 | |||
8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
9 | PR = "r32" | 9 | PR = "r32" |
10 | 10 | ||
11 | PACKAGES = "\ | 11 | inherit packagegroup |
12 | packagegroup-core-x11-sato \ | ||
13 | packagegroup-core-x11-sato-dbg \ | ||
14 | packagegroup-core-x11-sato-dev \ | ||
15 | " | ||
16 | 12 | ||
17 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 13 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
18 | 14 | ||
19 | ALLOW_EMPTY = "1" | ||
20 | |||
21 | NETWORK_MANAGER ?= "connman-gnome" | 15 | NETWORK_MANAGER ?= "connman-gnome" |
22 | NETWORK_MANAGER_libc-uclibc = "" | 16 | NETWORK_MANAGER_libc-uclibc = "" |
23 | 17 | ||
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb index 4c16c461a3..3fe5caee93 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb | |||
@@ -8,24 +8,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 | |||
8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
9 | PR = "r36" | 9 | PR = "r36" |
10 | 10 | ||
11 | inherit packagegroup | ||
12 | |||
11 | PACKAGES = "\ | 13 | PACKAGES = "\ |
12 | packagegroup-core-apps-x11-core \ | 14 | packagegroup-core-apps-x11-core \ |
13 | packagegroup-core-apps-x11-core-dbg \ | ||
14 | packagegroup-core-apps-x11-core-dev \ | ||
15 | packagegroup-core-apps-x11-games \ | 15 | packagegroup-core-apps-x11-games \ |
16 | packagegroup-core-apps-x11-games-dbg \ | ||
17 | packagegroup-core-apps-x11-games-dev \ | ||
18 | packagegroup-core-x11-base \ | 16 | packagegroup-core-x11-base \ |
19 | packagegroup-core-x11-base-dbg \ | ||
20 | packagegroup-core-x11-base-dev \ | ||
21 | " | 17 | " |
22 | 18 | ||
23 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 19 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
24 | 20 | ||
25 | XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" | 21 | XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" |
26 | 22 | ||
27 | ALLOW_EMPTY = "1" | ||
28 | |||
29 | # pcmanfm doesn't work on mips/powerpc | 23 | # pcmanfm doesn't work on mips/powerpc |
30 | FILEMANAGER ?= "pcmanfm" | 24 | FILEMANAGER ?= "pcmanfm" |
31 | FILEMANAGER_mips ?= "" | 25 | FILEMANAGER_mips ?= "" |