[oe-commits] Martin Jansa : packagegroup*: set PACKAGE_ARCH before packagegroup inherit

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 5a25dde053e93e64b945776ab3fbf8b67c8c0773
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=5a25dde053e93e64b945776ab3fbf8b67c8c0773

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Aug 24 18:01:11 2014 +0200

packagegroup*: set PACKAGE_ARCH before packagegroup inherit

* The required order was changed in oe-core commit:
  allarch: Add warning about packagegroup
  Since we want to start including this class conditionally, detect cases
  where packagegroup files use the old ordering and inform the user they
  need to update this.
* drop PACKAGE_ARCH setting from xorg-fonts-100dpi - nothing seems MACHINE
  specific in it

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-core/packagegroups/packagegroup-basic.bb | 5 +----
 meta-oe/recipes-core/packagegroups/packagegroup-boot.bb  | 5 +----
 meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb  | 2 --
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index ad1cd83..20b1652 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -7,11 +7,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
 
 PR = "r13"
 
-inherit packagegroup
-
-# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
-#
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
 
 # Poke extra recomendations into the list using your machine.conf
 #
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
index 61a519d..f50443d 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
@@ -4,11 +4,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
 
 PR = "r58"
 
-inherit packagegroup
-
-# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
-#
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
 
 #
 # those ones can be set in machine config to supply packages needed to get machine booting
diff --git a/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb b/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb
index aacf379..fd6c992 100644
--- a/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb
+++ b/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb
@@ -3,8 +3,6 @@ LICENSE = "Custom"
 
 inherit packagegroup
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 RDEPENDS_${PN} = "\
 	font-adobe-100dpi \
 	font-adobe-utopia-100dpi \