2 files changed, 29 insertions, 4 deletions

diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h
new file mode 100644
index 0000000000..8cdf828af8
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h
@@ -0,0 +1,24 @@
+/*
+ *  linux/include/asm-arm/procinfo.h
+ *
+ *  Copyright (C) 1996-1999 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ASM_PROCINFO_H
+#define __ASM_PROCINFO_H
+
+#define HWCAP_SWP       1
+#define HWCAP_HALF      2
+#define HWCAP_THUMB     4
+#define HWCAP_26BIT     8       /* Play it safe */
+#define HWCAP_FAST_MULT 16
+#define HWCAP_FPA       32
+#define HWCAP_VFP       64
+#define HWCAP_EDSP      128
+#define HWCAP_JAVA      256
+#define HWCAP_IWMMXT    512
+#define HWCAP_CRUNCH    1024
+#endif
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 1832abe56b..457f16c1f7 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,9 +2,10 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "unifdef-native"
-PR = "r5"
+PR = "r6"
 
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2"
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+           file://procinfo.h"
 
 S = "${WORKDIR}/linux-${PV}"
 
@@ -41,7 +42,7 @@ do_install() {
 }
 
 do_install_append_arm() {
-        cp include/asm-arm/procinfo.h ${D}${includedir}/asm
+        cp ${WORKDIR}/procinfo.h ${D}${includedir}/asm/
 }
 
 STAGE_TEMP="${WORKDIR}/temp-staging"
@@ -53,7 +54,7 @@ do_stage () {
         mkdir -p ${STAGE_TEMP}
         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
+                cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
         fi
         install -d ${STAGING_INCDIR}
         rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic