linux-libc-headers: Fix further ARCH references

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1369 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 9 insertions, 8 deletions

diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
index 0956d0f3c4..3fd7120673 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 DEFAULT_PREFERENCE = "-1"
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = " \
         ${KERNELORG_MIRROR}/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2 \
@@ -52,6 +52,6 @@ do_stage () {
         rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
         install -d ${CROSS_DIR}/${TARGET_SYS}/include
         cp -pfLR ${S}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-        cp -pfLR ${S}${includedir}/asm-${ARCH} ${CROSS_DIR}/${TARGET_SYS}/include/asm
+        cp -pfLR ${S}${includedir}/asm-$ARCH ${CROSS_DIR}/${TARGET_SYS}/include/asm
         cp -pfLR ${S}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/
 }
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
index e1f3627371..d53134f406 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "unifdef-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://arm-syscall-define.patch;patch=1"
@@ -30,7 +30,7 @@ set_arch() {
 
 do_configure() {
         set_arch
-        oe_runmake allnoconfig ARCH=${ARCH}
+        oe_runmake allnoconfig ARCH=$ARCH
 }
 
 do_compile () {
@@ -51,7 +51,7 @@ do_stage () {
         set_arch
         rm -rf ${STAGE_TEMP}
         mkdir -p ${STAGE_TEMP}
-        oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH}
+        oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
         if [ "$ARCH" == "arm" ]; then
                 cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm
         fi
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
index 420c7e854a..dbdc9c6597 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "unifdef-native"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2"
 
@@ -29,7 +29,7 @@ set_arch() {
 
 do_configure() {
         set_arch
-        oe_runmake allnoconfig ARCH=${ARCH}
+        oe_runmake allnoconfig ARCH=$ARCH
 }
 
 do_compile () {
@@ -48,9 +48,10 @@ STAGE_TEMP="${WORKDIR}/temp-staging"
 
 do_stage () {
         set_arch
+        echo $ARCH
         rm -rf ${STAGE_TEMP}
         mkdir -p ${STAGE_TEMP}
-        oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH}
+        oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
         if [ "$ARCH" == "arm" ]; then
                 cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm
         fi