summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-10-27 10:32:48 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-01 17:43:58 +0000
commiteedae071c79a9298afbf08a8d17f8fc480e0e34e (patch)
tree53d63ec50b6a932cde683dff4a16013dd50bcd85 /meta
parente422bb1bc5d4fe6fea78fd1f45e84f3d83b916d5 (diff)
downloadpoky-eedae071c79a9298afbf08a8d17f8fc480e0e34e.tar.gz
linux-libc-headers: provide 3.0.x and 3.1 headers
Provide both a 3.0.x and a 3.1 set of headers to the toolchain. Compatibility is maintained with older 2.6 headers by creating a new variable that changes the SRC_URI based on the major version number of the kernel. Built and booted with 2.6.37.2, 3.0.8 and 3.1 linux-libc-headers. (From OE-Core rev: 13c233ce4551542481d7a6390ff2119671137b95) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc17
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb7
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb7
4 files changed, 28 insertions, 5 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 2bf1beb0a8..ed722be811 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -21,7 +21,7 @@ SDKGCCVERSION ?= "4.6%"
21BINUVERSION ?= "2.21.1a" 21BINUVERSION ?= "2.21.1a"
22EGLIBCVERSION ?= "2.13" 22EGLIBCVERSION ?= "2.13"
23UCLIBCVERSION ?= "0.9.32" 23UCLIBCVERSION ?= "0.9.32"
24LINUXLIBCVERSION ?= "2.6.37.2" 24LINUXLIBCVERSION ?= "3.1"
25 25
26# Temporary preferred version overrides for PPC 26# Temporary preferred version overrides for PPC
27PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08" 27PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08"
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 e586ac301e..4137be1a45 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -1,9 +1,18 @@
1DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." 1DESCRIPTION = "Sanitized set of kernel headers for the C library's use."
2SECTION = "devel" 2SECTION = "devel"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4 4
5LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 5LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
6SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2" 6
7python __anonymous () {
8 major = d.getVar("PV",True).split('.')[0]
9 if major == "3":
10 d.setVar("HEADER_FETCH_VER", "3.0")
11 else:
12 d.setVar("HEADER_FETCH_VER", "2.6")
13}
14
15SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.bz2"
7 16
8S = "${WORKDIR}/linux-${PV}" 17S = "${WORKDIR}/linux-${PV}"
9 18
@@ -54,4 +63,4 @@ RDEPENDS_${PN}-dev = ""
54RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" 63RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
55 64
56INHIBIT_DEFAULT_DEPS = "1" 65INHIBIT_DEFAULT_DEPS = "1"
57DEPENDS += "unifdef-native" \ No newline at end of file 66DEPENDS += "unifdef-native"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
new file mode 100644
index 0000000000..7bb589550b
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
@@ -0,0 +1,7 @@
1require linux-libc-headers.inc
2
3PR = "r1"
4
5SRC_URI += " file://connector-msg-size-fix.patch"
6SRC_URI[md5sum] = "eac4d398a0ecd98214487cd47a228998"
7SRC_URI[sha256sum] = "4ed16da319848f681f711dbda2ac2cf1b306a280ec22f90bae190cf23b533add"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
new file mode 100644
index 0000000000..b87ecde0f8
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
@@ -0,0 +1,7 @@
1require linux-libc-headers.inc
2
3PR = "r1"
4
5SRC_URI += " file://connector-msg-size-fix.patch"
6SRC_URI[md5sum] = "8d43453f8159b2332ad410b19d86a931"
7SRC_URI[sha256sum] = "2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"