[PATCH 0/2] fix MACHINE_ARCH issue in keymaps

[PATCH 0/2] fix MACHINE_ARCH issue in keymaps

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

This fixes a build failure on the autobuilder


Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: oe-work
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=oe-work

Thanks,
    Saul Wold <sgw@linux.intel.com>
---


Saul Wold (2):
  keymaps: Fix MACHINE -> MACHINE_ARCH
  bitbake.conf: fix PACKAGE_ARCH[vardepsexclude]

 meta/conf/bitbake.conf                  |    6 +++---
 meta/recipes-bsp/keymaps/keymaps_1.0.bb |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

[PATCH 1/2] keymaps: Fix MACHINE -> MACHINE_ARCH

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

Fixes [YOCTO #960]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-bsp/keymaps/keymaps_1.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index 88823ae..7f2211a 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
@@ -4,8 +4,8 @@ SECTION = "base"
 RDEPENDS_${PN} = "initscripts console-tools"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PACKAGE_ARCH = "${MACHINE}"
-PR = "r17"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PR = "r18"
 
 inherit update-rc.d
 
-- 
1.7.1

[PATCH 2/2] bitbake.conf: fix PACKAGE_ARCH[vardepsexclude]

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/conf/bitbake.conf |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a825c17..f4de612 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -95,9 +95,9 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
 PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}"
 PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
-# MACHINE shouldn't be included here as a variable dependency since machine specific 
-# packages are handled using multimachine
-PACKAGE_ARCHS[vardepsexclude] = "MACHINE"
+# MACHINE_ARCH shouldn't be included here as a variable dependency
+# since machine specific packages are handled using multimachine
+PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH"
 
 MULTIMACH_ARCH = "${PACKAGE_ARCH}"
 MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-- 
1.7.1