summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-07-21 11:21:06 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-23 08:48:41 +0100
commit9120130eabd86d2d59b40214710a7f50dededc4c (patch)
treeb5ca2c179afbe8418b3d39b3e07ef64b73a5ee0b
parentc56cb3156590db867541eabad9e19a20f24b800d (diff)
downloadpoky-9120130eabd86d2d59b40214710a7f50dededc4c.tar.gz
linux-libc-headers: update to 4.1
Updating the libc-headers to match the 4.1 LTSI kernel version. We also tweak the logic in linux-libc-headers.inc to look in the 4.x subdirectory if a 4.x kernel is specified as the header source. (From OE-Core rev: 3143920c541b55b543b9dcc12b18af4e0e4b7ae1) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc2
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb7
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb7
4 files changed, 10 insertions, 8 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 096bec9fd6..84ecd72480 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -28,7 +28,7 @@ BINUVERSION ?= "2.25"
28GDBVERSION ?= "7.9%" 28GDBVERSION ?= "7.9%"
29GLIBCVERSION ?= "2.21" 29GLIBCVERSION ?= "2.21"
30UCLIBCVERSION ?= "0.9.33+git%" 30UCLIBCVERSION ?= "0.9.33+git%"
31LINUXLIBCVERSION ?= "3.19" 31LINUXLIBCVERSION ?= "4.1"
32 32
33PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 33PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
34PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" 34PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
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 b18d09fd6c..566bc1e615 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -35,6 +35,8 @@ python __anonymous () {
35 major = d.getVar("PV",True).split('.')[0] 35 major = d.getVar("PV",True).split('.')[0]
36 if major == "3": 36 if major == "3":
37 d.setVar("HEADER_FETCH_VER", "3.0") 37 d.setVar("HEADER_FETCH_VER", "3.0")
38 elif major == "4":
39 d.setVar("HEADER_FETCH_VER", "4.x")
38 else: 40 else:
39 d.setVar("HEADER_FETCH_VER", "2.6") 41 d.setVar("HEADER_FETCH_VER", "2.6")
40} 42}
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb
deleted file mode 100644
index 078df4512b..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1KORG_ARCHIVE_COMPRESSION = "xz"
2
3require linux-libc-headers.inc
4
5SRC_URI[md5sum] = "d3fc8316d4d4d04b65cbc2d70799e763"
6SRC_URI[sha256sum] = "be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c"
7
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb
new file mode 100644
index 0000000000..d816e5e784
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb
@@ -0,0 +1,7 @@
1KORG_ARCHIVE_COMPRESSION = "xz"
2
3require linux-libc-headers.inc
4
5SRC_URI[md5sum] = "fe9dc0f6729f36400ea81aa41d614c37"
6SRC_URI[sha256sum] = "caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f"
7