summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/packagegroups
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-26 18:16:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:52:57 +0100
commit9bb6f42763d7c3aa4d59ac08b2b4252d2e2b00a2 (patch)
tree43b3913030dff1ed7d0949bc1adc13df60a7f2ed /meta/recipes-sato/packagegroups
parent073a12c9cbedd210499835d608d98005251f7d6a (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb8
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb8
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11.bb10
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"
9PR = "r1" 9PR = "r1"
10 10
11PACKAGES = "\ 11inherit packagegroup
12 packagegroup-core-x11-mini \
13 packagegroup-core-x11-mini-dbg \
14 packagegroup-core-x11-mini-dev \
15 "
16 12
17PACKAGE_ARCH = "${MACHINE_ARCH}" 13PACKAGE_ARCH = "${MACHINE_ARCH}"
18 14
19XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" 15XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
20 16
21ALLOW_EMPTY = "1"
22
23ROOTLESS_X = "1" 17ROOTLESS_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"
9PR = "r32" 9PR = "r32"
10 10
11PACKAGES = "\ 11inherit packagegroup
12 packagegroup-core-x11-sato \
13 packagegroup-core-x11-sato-dbg \
14 packagegroup-core-x11-sato-dev \
15 "
16 12
17PACKAGE_ARCH = "${MACHINE_ARCH}" 13PACKAGE_ARCH = "${MACHINE_ARCH}"
18 14
19ALLOW_EMPTY = "1"
20
21NETWORK_MANAGER ?= "connman-gnome" 15NETWORK_MANAGER ?= "connman-gnome"
22NETWORK_MANAGER_libc-uclibc = "" 16NETWORK_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"
9PR = "r36" 9PR = "r36"
10 10
11inherit packagegroup
12
11PACKAGES = "\ 13PACKAGES = "\
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
23PACKAGE_ARCH = "${MACHINE_ARCH}" 19PACKAGE_ARCH = "${MACHINE_ARCH}"
24 20
25XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" 21XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
26 22
27ALLOW_EMPTY = "1"
28
29# pcmanfm doesn't work on mips/powerpc 23# pcmanfm doesn't work on mips/powerpc
30FILEMANAGER ?= "pcmanfm" 24FILEMANAGER ?= "pcmanfm"
31FILEMANAGER_mips ?= "" 25FILEMANAGER_mips ?= ""