Skip to contentSkip to conversation

linux-libc-headers-yocto: 3.4 and cleanups

PATCH New Bruce Ashfield 1 participant 3 messages Jun 22, 2012

lore
Share & tools
lore

Bruce Ashfield

author
#0 lore raw

cover linux-libc-headers-yocto: 3.4 and cleanups

Richard/Saul,

There aren't that many users of this recipe, but for those cases that we need it .. this needed a bit of love. I've made the same fix that went into the oe-core libc-headers and then bumped this recipe to the 3.4 standard/base for headers. With recent updates to the tools, there were parts of this recipe that could be removed, and they are now gone!

Cheers,

Bruce

The following changes since commit b876f42821383bf0069ee49b607ba06614417fba:
Bogdan Marinescu (1):
guile: fix compilation on MIPS/PPC

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 (2):
linux-libc-headers-yocto: use kernel-arch to set ARCH
linux-libc-headers-yocto: update to v3.4 and remove unecessary code

 .../linux-libc-headers-yocto_git.bb                |   45 ++++----------------
 1 files changed, 8 insertions(+), 37 deletions(-)
author
#1 lore raw

PATCH 1/2 linux-libc-headers-yocto: use kernel-arch to set ARCH

The arch mapping done in kernel-arch should be used instead of recipe local mapping. Inheriting kernel-arch consolidates the code and simplifies the libc-header recipe.

Signed-off-by Bruce Ashfield <[email protected]>
---
 .../linux-libc-headers-yocto_git.bb                |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)
meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb +3 -14
index 756b596..831e452 100644
@@ -20,25 +20,14 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;nocheckout=1;
 # building a device tree as part of kern headers
 KERNEL_DEVICETREE = ""
 
-set_arch() {
-	case ${TARGET_ARCH} in
-		arm*)     ARCH=arm ;;
-		i*86*)    ARCH=i386 ;;
-		ia64*)    ARCH=ia64 ;;
-		mips*)    ARCH=mips ;;
-		powerpc*) ARCH=powerpc ;;
-		x86_64*)  ARCH=x86_64 ;;
-	esac
-}
+inherit kernel-arch
 
 do_configure() {
-	set_arch
-	oe_runmake allnoconfig ARCH=$ARCH
+	oe_runmake allnoconfig
 }
 
 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}
 
         # The ..install.cmd conflicts between various configure runs
         find ${D}${includedir} -name ..install.cmd | xargs rm -f
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/2 linux-libc-headers-yocto: update to v3.4 and remove unecessary code

In reply to Bruce Ashfield

Updating the linux-libc-headers-yocto recipe to 3.4. There are blocks of code and definitions that are handled by the included libc-headers.inc, so we shouldn't be repeating them in this recipe.

Signed-off-by Bruce Ashfield <[email protected]>
---
 .../linux-libc-headers-yocto_git.bb                |   32 ++++---------------
 1 files changed, 7 insertions(+), 25 deletions(-)
meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb +7 -25
index 831e452..b4222f1 100644
@@ -3,18 +3,17 @@ include recipes-kernel/linux/linux-yocto.inc
 
 B = "${S}"
 
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS += "unifdef-native"
 PROVIDES = "linux-libc-headers"
 RPROVIDES_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg"
-SRCREV = "21ab5dca134a6bf1316aa59f69f9ee9e091d5702"
-KBRANCH ?= "standard/base"
-KMETA ?= "meta"
-PV = "3.2+git-${SRCPV}"
-PR = "r5"
 
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
+KBRANCH = "standard/base"
+SRCREV = "a1cdb60720c452c3965eaec3ec2cd10f06261cc5"
+
+PV = "3.4+git-${SRCPV}"
+PR = "r6"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
 
 # force this to empty to prevent installation failures, we aren't
 # building a device tree as part of kern headers

@@ -22,17 +21,6 @@ KERNEL_DEVICETREE = ""
 
 inherit kernel-arch
 
-do_configure() {
-	oe_runmake allnoconfig
-}
-
-do_install() {
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}
-
-        # The ..install.cmd conflicts between various configure runs
-        find ${D}${includedir} -name ..install.cmd | xargs rm -f
-}
-
 # The following tasks are not required when we just want
 # headers. So we override and stub them out.
 do_kernel_configme() {

@@ -41,12 +29,6 @@ do_kernel_configme() {
 do_patch () {
 }
 
-do_compile () {
-}
-
-do_validate_branches () {
-}
-
 do_kernel_configcheck () {
 }
Signature · 1 line
1.7.0.4