[PATCH 0/1] linux-libc-headers: use kernel-arch for ARCH

[PATCH 0/1] linux-libc-headers: use kernel-arch for ARCH

[Bruce Ashfield]

Richard/Saul,

While working on the standalone perf support, I used kernel-arch
to get ARCH properly set for the build. 

Richard mentioned this ages (2years+) ago that the libc-headers
code really shouldn't do it's own ARCH mapping. So I converted
the .inc file to inherit kernel-arch and pickup the ARCH defition.

This worked here on some core-image-minimal builds. I'll make the
same change in other layers once I know if this is ok or not :)

Cheers,

Bruce

The following changes since commit b440f989fd72e5cbb8f6ea222edc0bc7cdedbba2:
  Bruce Ashfield (1):
        recipes-kernel: remove linux-tools.inc

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/libc-headers
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/libc-headers

Bruce Ashfield (1):
  linux-libc-headers: use kernel-arch to set ARCH

 .../linux-libc-headers/linux-libc-headers.inc      |   30 ++-----------------
 1 files changed, 4 insertions(+), 26 deletions(-)

[PATCH 1/1] linux-libc-headers: use kernel-arch to set ARCH

[Bruce Ashfield]

linux-libc-headers no longer needs its own ARCH mapping code,
since the mapping done in kernel-arch works and we can
consolidate all arch mapping code in a single place.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../linux-libc-headers/linux-libc-headers.inc      |   30 ++-----------------
 1 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 4137be1..962ca75 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -12,43 +12,21 @@ python __anonymous () {
 	d.setVar("HEADER_FETCH_VER", "2.6")
 }
 
+inherit kernel-arch
+
 SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.bz2"
 
 S = "${WORKDIR}/linux-${PV}"
 
-set_arch() {
-	case ${TARGET_ARCH} in
-		alpha*)   ARCH=alpha ;;
-		arm*)     ARCH=arm ;;
-		cris*)    ARCH=cris ;;
-		hppa*)    ARCH=parisc ;;
-		i*86*)    ARCH=i386 ;;
-		ia64*)    ARCH=ia64 ;;
-		mips*)    ARCH=mips ;;
-		m68k*)    ARCH=m68k ;;
-		powerpc*) ARCH=powerpc ;;
-		s390*)    ARCH=s390 ;;
-		sh*)      ARCH=sh ;;
-		sparc64*) ARCH=sparc64 ;;
-		sparc*)   ARCH=sparc ;;
-		x86_64*)  ARCH=x86_64 ;;
-		avr32*)   ARCH=avr32 ;;
-		bfin*)    ARCH=blackfin ;;
-		microblaze*) ARCH=microblaze ;;
-	esac
-}
-
 do_configure() {
-	set_arch
-	oe_runmake allnoconfig ARCH=$ARCH
+	oe_runmake allnoconfig
 }
 
 do_compile () {
 }
 
 do_install() {
-	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}
 	# Kernel should not be exporting this header
 	rm -f ${D}${exec_prefix}/include/scsi/scsi.h
 
-- 
1.7.0.4

Re: [PATCH 1/1] linux-libc-headers: use kernel-arch to set ARCH

[Richard Purdie]

On Wed, 2012-06-20 at 10:54 -0400, Bruce Ashfield wrote:
> linux-libc-headers no longer needs its own ARCH mapping code,
> since the mapping done in kernel-arch works and we can
> consolidate all arch mapping code in a single place.
> 
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  .../linux-libc-headers/linux-libc-headers.inc      |   30 ++-----------------
>  1 files changed, 4 insertions(+), 26 deletions(-)

Merged to master, thanks.

Richard