diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-19 13:36:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-23 23:01:51 +0100 |
| commit | a56aed2e6e1b73bffd2bf82145fe48b82fde9292 (patch) | |
| tree | 0e8ee3fc6841b359d9597ca0f3c3f159e888d026 | |
| parent | 30aaada4b79fc1acad5fdaba98071b63c52b9e05 (diff) | |
| download | openembedded-core-a56aed2e6e1b73bffd2bf82145fe48b82fde9292.tar.gz openembedded-core-a56aed2e6e1b73bffd2bf82145fe48b82fde9292.tar.bz2 openembedded-core-a56aed2e6e1b73bffd2bf82145fe48b82fde9292.zip | |
packagegroup: Move inherit packagegroup to after PACKAGE_ARCH
This means these classes now avoid the allarch inherit entirely.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 LICENSE = "MIT" PR = "r83" +# +# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH +# +PACKAGE_ARCH = "${MACHINE_ARCH}" + inherit packagegroup PROVIDES = "${PACKAGES}" @@ -39,11 +44,6 @@ PACKAGES = ' \ \ ' -# -# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH -# -PACKAGE_ARCH = "${MACHINE_ARCH}" - # Override by distro if needed VIRTUAL-RUNTIME_keymaps ?= "keymaps" 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" LICENSE = "MIT" PR = "r17" -inherit packagegroup - PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit packagegroup + # # Set by the machine configuration with packages essential for device bootup # 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" PR = "r3" -inherit packagegroup - PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit packagegroup + PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" 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" PR = "r2" -inherit packagegroup - PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit packagegroup + # kexec-tools doesn't work on Mips KEXECTOOLS ?= "kexec" KEXECTOOLS_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" LICENSE = "MIT" PR = "r40" -inherit packagegroup - PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit packagegroup + XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" XSERVERCODECS ?= "" 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" LICENSE = "MIT" PR = "r33" -inherit packagegroup - PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit packagegroup + PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" RDEPENDS_${PN} = "\ |