Skip to contentSkip to conversation

linux-libc-headers: 3.2 and linux-libc-headers-yocto movement

PATCH Applied Bruce Ashfield 4 participants 10 messages Mar 23, 2012 – Mar 25, 2012

lore
Share & tools
lore

Bruce Ashfield

author
#0 lore raw

cover linux-libc-headers: 3.2 and linux-libc-headers-yocto movement

Richard/Saul,

As discussed on the mailing list here is a libc-headers series. I've kept it in three parts so you can pick what you want (except for the minor detail of needing to split patch 1/1 to keep 3.1 around if you don't want 2/3).

I've built and booted this on all the emulated targets, and have some other builds running against larger numbers of packages as well.

Cheers,

Bruce

The following changes since commit bb1d7fad7ff8515939f2b5f0b540b9b09604be3c:
Richard Purdie (1):
Revert "bitbake.conf/sstate.bbclass: Change PATH when installing sstate files to avoid issues"

are available in the git repository at:

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

Bruce Ashfield (3):
linux-libc-headers: add 3.2 headers and remove 3.1
linux-libc-headers: set default LINUXLIBCVERSION to 3.2
linux-libc-headers-yocto: remove from oe-core

 meta/conf/distro/include/tcmode-default.inc        |    2 +-
 .../linux-libc-headers-yocto_git.bb                |   64 --------------------
 .../linux-libc-headers/linux-libc-headers_3.1.bb   |    7 --
 .../linux-libc-headers/linux-libc-headers_3.2.bb   |    6 ++
 4 files changed, 7 insertions(+), 72 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
 create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.2.bb
author
#1 lore raw

PATCH 1/3 linux-libc-headers: add 3.2 headers and remove 3.1

The 3.1 kernel was never released or directly supported via oe-core. So as part of update the libc-headers to 3.2 we can take the opportunity to remove it.

Built and booted on the qemu* targets.

Signed-off-by Bruce Ashfield <[email protected]>
---
 .../linux-libc-headers/linux-libc-headers_3.1.bb   |    7 -------
 .../linux-libc-headers/linux-libc-headers_3.2.bb   |    6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
 create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.2.bb
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb deleted +0 -7
deleted file mode 100644
index b87ecde..0000000
@@ -1,7 +0,0 @@
-require linux-libc-headers.inc
-
-PR = "r1"
-
-SRC_URI += " file://connector-msg-size-fix.patch"
-SRC_URI[md5sum] = "8d43453f8159b2332ad410b19d86a931"
-SRC_URI[sha256sum] = "2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.2.bb new file +6 -0
new file mode 100644
index 0000000..9bee02b
@@ -0,0 +1,6 @@
+require linux-libc-headers.inc
+
+PR = "r1"
+
+SRC_URI[md5sum] = "7ceb61f87c097fc17509844b71268935"
+SRC_URI[sha256sum] = "c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463"
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/3 linux-libc-headers: set default LINUXLIBCVERSION to 3.2

In reply to Bruce Ashfield

Switch the default libc-headers to the 3.2 version.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/conf/distro/include/tcmode-default.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/tcmode-default.inc +1 -1
index 28c25db..b481163 100644
@@ -22,7 +22,7 @@ SDKGCCVERSION ?= "4.6%"
 BINUVERSION ?= "2.22"
 EGLIBCVERSION ?= "2.13"
 UCLIBCVERSION ?= "0.9.33"
-LINUXLIBCVERSION ?= "3.1"
+LINUXLIBCVERSION ?= "3.2"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
Signature · 1 line
1.7.0.4
#3 lore raw

Re: [PATCH 2/3] linux-libc-headers: set default LINUXLIBCVERSION to 3.2

Quoted 1 line · Bruce Ashfield

Switch the default libc-headers to the 3.2 version.

I spoke to soon. I seeing a problem with iptables in the builds I left running. I know we looked at this just recently, so it may just be a matter of undoing that fix.

I'm looking at it now, but waned to follow up right away.

Bruce

Quoted 27 lines
Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/conf/distro/include/tcmode-default.inc |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/tcmode-default.inc +0 -0
index 28c25db..b481163 100644
@@ -22,7 +22,7 @@ SDKGCCVERSION ?= "4.6%"

 BINUVERSION ?= "2.22"
 EGLIBCVERSION ?= "2.13"
 UCLIBCVERSION ?= "0.9.33"

meta/conf/distro/include/tcmode-default.inc +1 -1
-LINUXLIBCVERSION ?= "3.1"
+LINUXLIBCVERSION ?= "3.2"

 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
--
1.7.0.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
#4 lore raw

Re: [PATCH 2/3] linux-libc-headers: set default LINUXLIBCVERSION to 3.2

Quoted 9 lines · Bruce Ashfield
Quoted 1 line · Bruce Ashfield

Switch the default libc-headers to the 3.2 version.

I spoke to soon. I seeing a problem with iptables in the builds I left running. I know we looked at this just recently, so it may just be a matter of undoing that fix.

I'm looking at it now, but waned to follow up right away.

Ah yes, this is the issue that was discussed with respect to some of the intel BSPs using headers that were newer than 3.2. We temporarily avoided it by stepping back to the 3.1 headers.

The step back isn't a great solution, so I'm looking at fixing this properly now.

Cheers,

Bruce

Quoted 36 lines

Bruce

Quoted 23 lines
Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/conf/distro/include/tcmode-default.inc |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/tcmode-default.inc +0 -0
index 28c25db..b481163 100644
@@ -22,7 +22,7 @@ SDKGCCVERSION ?= "4.6%"

 BINUVERSION ?= "2.22"
 EGLIBCVERSION ?= "2.13"
 UCLIBCVERSION ?= "0.9.33"

meta/conf/distro/include/tcmode-default.inc +1 -1
-LINUXLIBCVERSION ?= "3.1"
+LINUXLIBCVERSION ?= "3.2"

 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
--
1.7.0.4

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
author
#5 lore raw

PATCH 3/3 linux-libc-headers-yocto: remove from oe-core

In reply to Bruce Ashfield

The linux-libc-headers-yocto is not required in oe-core, it can be moved to yocto specific layers. The linux-libc-headers_* recipes provide sufficient headers fore core users.

Signed-off-by Bruce Ashfield <[email protected]>
---
 .../linux-libc-headers-yocto_git.bb                |   64 --------------------
 1 files changed, 0 insertions(+), 64 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb deleted +0 -64
deleted file mode 100644
index 7aa9322..0000000
@@ -1,64 +0,0 @@
-require linux-libc-headers.inc
-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"
-
-# force this to empty to prevent installation failures, we aren't
-# 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
-}
-
-do_configure() {
-	set_arch
-	oe_runmake allnoconfig ARCH=$ARCH
-}
-
-do_install() {
-	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
-
-        # 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() {
-}
-
-do_patch () {
-}
-
-do_compile () {
-}
-
-do_validate_branches () {
-}
-
-do_kernel_configcheck () {
-}
-
-BBCLASSEXTEND = "nativesdk"
Signature · 1 line
1.7.0.4
#6 lore raw
In reply to Bruce Ashfield

Op 23 mrt. 2012, om 18:07 heeft Bruce Ashfield het volgende geschreven:

Quoted 19 lines

Richard/Saul,

As discussed on the mailing list here is a libc-headers series. I've kept it in three parts so you can pick what you want (except for the minor detail of needing to split patch 1/1 to keep 3.1 around if you don't want 2/3).

I've built and booted this on all the emulated targets, and have some other builds running against larger numbers of packages as well.

Cheers,

Bruce

The following changes since commit bb1d7fad7ff8515939f2b5f0b540b9b09604be3c:
Richard Purdie (1):
Revert "bitbake.conf/sstate.bbclass: Change PATH when installing sstate files to avoid issues"

are available in the git repository at:

Quoted 7 lines

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

Bruce Ashfield (3):
linux-libc-headers: add 3.2 headers and remove 3.1
linux-libc-headers: set default LINUXLIBCVERSION to 3.2
linux-libc-headers-yocto: remove from oe-core

Would it make more sense to move to 3.3 or is that too risky at this point? I'm fine with the patchset either way, though.

regards,

Koen

#7 lore raw
Quoted 25 lines · Koen Kooi

Op 23 mrt. 2012, om 18:07 heeft Bruce Ashfield het volgende geschreven:

Quoted 22 lines

Richard/Saul,

As discussed on the mailing list here is a libc-headers series. I've kept it in three parts so you can pick what you want (except for the minor detail of needing to split patch 1/1 to keep 3.1 around if you don't want 2/3).

I've built and booted this on all the emulated targets, and have some other builds running against larger numbers of packages as well.

Cheers,

Bruce

The following changes since commit bb1d7fad7ff8515939f2b5f0b540b9b09604be3c:
 Richard Purdie (1):
       Revert "bitbake.conf/sstate.bbclass: Change PATH when installing sstate files to avoid issues"

are available in the git repository at:

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

Quoted 6 lines
Quoted 4 lines

Bruce Ashfield (3):
 linux-libc-headers: add 3.2 headers and remove 3.1
 linux-libc-headers: set default LINUXLIBCVERSION to 3.2
 linux-libc-headers-yocto: remove from oe-core

Would it make more sense to move to 3.3 or is that too risky at this point? I'm fine with the patchset either way, though.

I thought about it as well, but since I've been building a booting 3.2 more often than 3.3, I took it easy with this change.

But a 3.3/3.4 bump makes sense in the not too distant future, and obviously if there's consensus, I wouldn't argue strenuously against 3.3.

Cheers,

Bruce

Quoted 8 lines

regards,

Koen
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
#8 lore raw
In reply to Bruce Ashfield
Quoted 5 lines · Bruce Ashfield

Richard/Saul,

As discussed on the mailing list here is a libc-headers series. I've kept it in three parts so you can pick what you want (except for the minor detail of needing to split patch 1/1 to keep 3.1 around if you don't want 2/3).

I just pushed a follow up patch to zedd/libc-headers-oe to fix the iptables build
issue:

commit 1683eb3fb5d23a7d0e4f33ad9229b8a67c58ad15

Author: Bruce Ashfield <[email protected]>
Date:   Fri Mar 23 14:36:04 2012 -0400

iptables: fix build error against 3.2+ kernel headers

The iptables local linux/types.h overrides the kernel/sysroot types.h. As such, we need to provide some defines that are required to build against 3.2+ kernel headers.

ifndef protection is provided for the defines to ensure that configuration that already have these defines are still buildable.

This commit is temporary until a new version of iptables can be used that contains the defines.

Signed-off-by Bruce Ashfield <[email protected]>

:000000 100644 0000000... 09c7989... A meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch :100644 100644 2d3d311... 663ddad... M meta/recipes-extended/iptables/iptables_1.4.12.2.bb

If you'd rather have me resend the series, just shout.

Cheers,

Bruce

Quoted 36 lines

I've built and booted this on all the emulated targets, and have some other builds running against larger numbers of packages as well.

Cheers,

Bruce

The following changes since commit bb1d7fad7ff8515939f2b5f0b540b9b09604be3c:
 Richard Purdie (1):
       Revert "bitbake.conf/sstate.bbclass: Change PATH when installing sstate files to avoid issues"

are available in the git repository at:

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

Bruce Ashfield (3):
 linux-libc-headers: add 3.2 headers and remove 3.1
 linux-libc-headers: set default LINUXLIBCVERSION to 3.2
 linux-libc-headers-yocto: remove from oe-core

 meta/conf/distro/include/tcmode-default.inc        |    2 +- .../linux-libc-headers-yocto_git.bb                |   64 -------------------- .../linux-libc-headers/linux-libc-headers_3.1.bb   |    7 -- .../linux-libc-headers/linux-libc-headers_3.2.bb   |    6 ++

 4 files changed, 7 insertions(+), 72 deletions(-)

 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.2.bb

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
Applied
#9 lore raw
In reply to Bruce Ashfield
Quoted 19 lines · Bruce Ashfield

Richard/Saul,

As discussed on the mailing list here is a libc-headers series. I've kept it in three parts so you can pick what you want (except for the minor detail of needing to split patch 1/1 to keep 3.1 around if you don't want 2/3).

I've built and booted this on all the emulated targets, and have some other builds running against larger numbers of packages as well.

Cheers,

Bruce

The following changes since commit bb1d7fad7ff8515939f2b5f0b540b9b09604be3c:
Richard Purdie (1):
Revert "bitbake.conf/sstate.bbclass: Change PATH when installing sstate files to avoid issues"

are available in the git repository at:

Quoted 7 lines

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

Bruce Ashfield (3):
linux-libc-headers: add 3.2 headers and remove 3.1
linux-libc-headers: set default LINUXLIBCVERSION to 3.2
linux-libc-headers-yocto: remove from oe-core

Merged to master (along with the iptables fix), thanks.

Richard