packagegroup: Move inherit packagegroup to after PACKAGE_ARCH

PATCH New Richard Purdie 1 participant 1 message Aug 19, 2014

lore

Share & tools

lore

Richard Purdie

author

2014-08-19 12:36 UTC #0 lore raw

PATCH 1/1 packagegroup: Move inherit packagegroup to after PACKAGE_ARCH

This means these classes now avoid the allarch inherit entirely.

Signed-off-by Richard Purdie <[email protected]>

meta/recipes-core/packagegroups/packagegroup-base.bb +5 -5

index 13a4fe4..f4b2cd5 100644
@@ -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"

meta/recipes-core/packagegroups/packagegroup-core-boot.bb +2 -2

index bdc4a1d..886c334 100644
@@ -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
 #

meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +2 -2

index 8c9dd8b..41d2548 100644
@@ -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)}"

meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +2 -2

index 15ed7f9..33a3eee 100644
@@ -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 ?= ""

meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +2 -2

index f595a54..2d68e97 100644
@@ -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 ?= ""

meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +2 -2

index 2d23fe4..bc3e0fd 100644
@@ -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} = "\