12 files changed, 12 insertions, 12 deletions
diff --git a/recipes/fbreader/fbreader_0.8.2a.bb b/recipes/fbreader/fbreader_0.8.2a.bb
index 50e27c5517..c1a24804c3 100644
--- a/recipes/fbreader/fbreader_0.8.2a.bb
+++ b/recipes/fbreader/fbreader_0.8.2a.bb
@@ -8,7 +8,7 @@ PR = "r7"
 
 # The RESOLUTION is defined at compile time which makes
 # this package MACHINE specific.
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN} = "${MACHINE_ARCH}"
 
 SRC_URI = "http://www.fbreader.org/obsolete/fbreader-sources-${PV}.tgz \
 	   file://fbreader-0.8.2a_buildsys_oe.patch \
diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index e47e66551e..4690e24590 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -78,7 +78,7 @@ RRECOMMENDS_${PN} += "\
 "
 
 PACKAGES =+ "${PN}-config"
-PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN}-config = "${MACHINE_ARCH}"
 
 # machine specific stuff, should ideally be elsewhere
 # - recommend MUXer on platforms that require one
diff --git a/recipes/miniinit/miniinit.bb b/recipes/miniinit/miniinit.bb
index 054c1bdae9..e6986a70c9 100644
--- a/recipes/miniinit/miniinit.bb
+++ b/recipes/miniinit/miniinit.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 # SERIAL_CONSOLE is generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN} = "${MACHINE_ARCH}"
 
 SRC_URI = "file://rcS file://inittab"
 
diff --git a/recipes/mipl-mipv6/mipv6_1.1-v2.4.26.bb b/recipes/mipl-mipv6/mipv6_1.1-v2.4.26.bb
index 913a388a21..d977589e9d 100644
--- a/recipes/mipl-mipv6/mipv6_1.1-v2.4.26.bb
+++ b/recipes/mipl-mipv6/mipv6_1.1-v2.4.26.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/kernel"
 LICENSE = "GPL"
 CFLAGS =+ "-I${S}/include -I${STAGING_KERNEL_DIR}/include"
 
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN} = "${MACHINE_ARCH}"
 
 PR ="r3"
 
diff --git a/recipes/mipl-mipv6/mipv6_2.0.2.bb b/recipes/mipl-mipv6/mipv6_2.0.2.bb
index ae20101870..0549ae2b8b 100644
--- a/recipes/mipl-mipv6/mipv6_2.0.2.bb
+++ b/recipes/mipl-mipv6/mipv6_2.0.2.bb
@@ -19,7 +19,7 @@ do_install() {
         oe_runmake sbindir="${D}${sbindir}" initdir="${D}${sysconfdir}/init.d" mandir="${D}${mandir}" docdir="${D}${docdir}/mobile-ip6" NETWORK_MIP6_CONF="${D}${sysconfdir}" install
 }
 
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN} = "${MACHINE_ARCH}"
 
 
 SRC_URI[md5sum] = "2cf58dca0ab3c38223e25dbecba8ed37"
diff --git a/recipes/obsolete/shr/alsa-scenarii-shr_git.bb b/recipes/obsolete/shr/alsa-scenarii-shr_git.bb
index 35bf569112..ab3e083a68 100644
--- a/recipes/obsolete/shr/alsa-scenarii-shr_git.bb
+++ b/recipes/obsolete/shr/alsa-scenarii-shr_git.bb
@@ -17,7 +17,7 @@ do_install() {
     install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
 }
 
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN} = "${MACHINE_ARCH}"
 
 FILES_${PN} += "${datadir}/shr"
 
diff --git a/recipes/openmoko2/openmoko-alsa-scenarios_svn.bb b/recipes/openmoko2/openmoko-alsa-scenarios_svn.bb
index 315ea4d1b9..7014919cbd 100644
--- a/recipes/openmoko2/openmoko-alsa-scenarios_svn.bb
+++ b/recipes/openmoko2/openmoko-alsa-scenarios_svn.bb
@@ -20,6 +20,6 @@ do_install() {
     install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
 }
 
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN} = "${MACHINE_ARCH}"
 
 FILES_${PN} += "${datadir}/openmoko"
diff --git a/recipes/shadow/shadow.inc b/recipes/shadow/shadow.inc
index 3d4886a4eb..0b850d182b 100644
--- a/recipes/shadow/shadow.inc
+++ b/recipes/shadow/shadow.inc
@@ -11,7 +11,7 @@ LICENSE = "BSD"
 SECTION = "base"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN} = "${MACHINE_ARCH}"
 
 INC_PR = "r16"
 
diff --git a/recipes/shr/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb
index bc7284f217..cf2a534f89 100644
--- a/recipes/shr/frameworkd-config-shr_git.bb
+++ b/recipes/shr/frameworkd-config-shr_git.bb
@@ -60,7 +60,7 @@ do_install_append() {
         install -m 0644 ${CONF_PATH}/*.wav ${D}${datadir}/sounds/
 }
 
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN} = "${MACHINE_ARCH}"
 
 # - add wmiconfig for wireless configuration
 RDEPENDS_${PN}_append_om-gta02 = " wmiconfig"
diff --git a/recipes/sysvinit/sysvinit_2.86.bb b/recipes/sysvinit/sysvinit_2.86.bb
index 40c642ab45..d75cb32048 100644
--- a/recipes/sysvinit/sysvinit_2.86.bb
+++ b/recipes/sysvinit/sysvinit_2.86.bb
@@ -6,7 +6,7 @@ PR = "r58"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
-PACKAGE_ARCH_${PN}-inittab = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN}-inittab = "${MACHINE_ARCH}"
 
 RDEPENDS_${PN} = "${PN}-inittab"
 
diff --git a/recipes/tasks/task-x11.bb b/recipes/tasks/task-x11.bb
index 77e281e699..a70bb15d90 100644
--- a/recipes/tasks/task-x11.bb
+++ b/recipes/tasks/task-x11.bb
@@ -25,7 +25,7 @@ XSERVER_COMMON ?= "xserver-kdrive-common"
 XSERVER_COMMON_shr = "xserver-common"
 
 # This is also the reason why we have to make this package machine specific :/
-PACKAGE_ARCH_${PN}-server = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN}-server = "${MACHINE_ARCH}"
 
 RDEPENDS_${PN}-server = "\
   ${XSERVER} \
diff --git a/recipes/usb-gadget-mode/usb-gadget-mode.bb b/recipes/usb-gadget-mode/usb-gadget-mode.bb
index aa0f76eb49..d7fbb35cd1 100644
--- a/recipes/usb-gadget-mode/usb-gadget-mode.bb
+++ b/recipes/usb-gadget-mode/usb-gadget-mode.bb
@@ -37,5 +37,5 @@ pkg_postrm_${PN}() {
 	update-rc.d -f usb-gadget remove
 }
 
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+PACKAGE_ARCH_pn-${PN} = "${MACHINE_ARCH}"