summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-19 13:36:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-25 08:57:44 +0100
commit9e213ddea23f577528e8ca8b752b29ca9593efa6 (patch)
tree1414c4285354ebe4f9367761c4da3b15b9dadead
parent9541ec7b5587323e8e1886ab37b9e8836d8df3ca (diff)
downloadpoky-9e213ddea23f577528e8ca8b752b29ca9593efa6.tar.gz
packagegroup: Move inherit packagegroup to after PACKAGE_ARCH
This means these classes now avoid the allarch inherit entirely. (From OE-Core rev: a56aed2e6e1b73bffd2bf82145fe48b82fde9292) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-base.bb10
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb4
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb4
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb4
6 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 13a4fe4f0c..f4b2cd574d 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -2,6 +2,11 @@ SUMMARY = "Merge machine and distro options to create a basic machine task/packa
2LICENSE = "MIT" 2LICENSE = "MIT"
3PR = "r83" 3PR = "r83"
4 4
5#
6# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
7#
8PACKAGE_ARCH = "${MACHINE_ARCH}"
9
5inherit packagegroup 10inherit packagegroup
6 11
7PROVIDES = "${PACKAGES}" 12PROVIDES = "${PACKAGES}"
@@ -39,11 +44,6 @@ PACKAGES = ' \
39 \ 44 \
40 ' 45 '
41 46
42#
43# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
44#
45PACKAGE_ARCH = "${MACHINE_ARCH}"
46
47# Override by distro if needed 47# Override by distro if needed
48VIRTUAL-RUNTIME_keymaps ?= "keymaps" 48VIRTUAL-RUNTIME_keymaps ?= "keymaps"
49 49
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index bdc4a1d413..886c33435c 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -7,10 +7,10 @@ DESCRIPTION = "The minimal set of packages required to boot the system"
7LICENSE = "MIT" 7LICENSE = "MIT"
8PR = "r17" 8PR = "r17"
9 9
10inherit packagegroup
11
12PACKAGE_ARCH = "${MACHINE_ARCH}" 10PACKAGE_ARCH = "${MACHINE_ARCH}"
13 11
12inherit packagegroup
13
14# 14#
15# Set by the machine configuration with packages essential for device bootup 15# Set by the machine configuration with packages essential for device bootup
16# 16#
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 8c9dd8b6f9..41d2548b70 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -7,10 +7,10 @@ LICENSE = "MIT"
7 7
8PR = "r3" 8PR = "r3"
9 9
10inherit packagegroup
11
12PACKAGE_ARCH = "${MACHINE_ARCH}" 10PACKAGE_ARCH = "${MACHINE_ARCH}"
13 11
12inherit packagegroup
13
14PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" 14PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}"
15PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" 15PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}"
16 16
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 15ed7f92a5..33a3eee258 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -7,10 +7,10 @@ LICENSE = "MIT"
7 7
8PR = "r2" 8PR = "r2"
9 9
10inherit packagegroup
11
12PACKAGE_ARCH = "${MACHINE_ARCH}" 10PACKAGE_ARCH = "${MACHINE_ARCH}"
13 11
12inherit packagegroup
13
14# kexec-tools doesn't work on Mips 14# kexec-tools doesn't work on Mips
15KEXECTOOLS ?= "kexec" 15KEXECTOOLS ?= "kexec"
16KEXECTOOLS_mips ?= "" 16KEXECTOOLS_mips ?= ""
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
index f595a54e9d..2d68e97383 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
@@ -6,10 +6,10 @@ SUMMARY = "X11 display server"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r40" 7PR = "r40"
8 8
9inherit packagegroup
10
11PACKAGE_ARCH = "${MACHINE_ARCH}" 9PACKAGE_ARCH = "${MACHINE_ARCH}"
12 10
11inherit packagegroup
12
13XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" 13XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
14XSERVERCODECS ?= "" 14XSERVERCODECS ?= ""
15 15
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 2d23fe48b2..bc3e0fd260 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -6,10 +6,10 @@ SUMMARY = "Sato desktop"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r33" 7PR = "r33"
8 8
9inherit packagegroup
10
11PACKAGE_ARCH = "${MACHINE_ARCH}" 9PACKAGE_ARCH = "${MACHINE_ARCH}"
12 10
11inherit packagegroup
12
13PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" 13PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
14 14
15RDEPENDS_${PN} = "\ 15RDEPENDS_${PN} = "\