From c36a5e21b711cd577a2186a5267d46bb4323acc1 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 24 Aug 2018 10:59:58 -0400 Subject: libc-headers: update to 4.18 Updating to the 4.18 headers to match the newest kernel that will be part of the release. 4.18 brings a requirement on bison-native to the libc-headers, since it is required as part of the configuration steps. We also tweak the license md5sum, since the kernel now includes SPDX headers in the license file and that changes our sum. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../linux-libc-headers/linux-libc-headers.inc | 4 ++-- .../linux-libc-headers/linux-libc-headers_4.15.7.bb | 13 ------------- .../linux-libc-headers/linux-libc-headers_4.18.bb | 12 ++++++++++++ 4 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 1c9226cb06..37dc5e9e0e 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -27,7 +27,7 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.31%" GDBVERSION ?= "8.1%" GLIBCVERSION ?= "2.28%" -LINUXLIBCVERSION ?= "4.15%" +LINUXLIBCVERSION ?= "4.18%" QEMUVERSION ?= "3.0%" PREFERRED_VERSION_gcc ?= "${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 b5cf96dd49..05c82558e6 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -30,7 +30,7 @@ LICENSE = "GPLv2" # # -- RP -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" python __anonymous () { major = d.getVar("PV").split('.')[0] @@ -92,4 +92,4 @@ RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" INHIBIT_DEFAULT_DEPS = "1" -DEPENDS += "unifdef-native" +DEPENDS += "unifdef-native bison-native" diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb deleted file mode 100644 index a7db4c9c01..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb +++ /dev/null @@ -1,13 +0,0 @@ -require linux-libc-headers.inc - -SRC_URI_append_libc-musl = "\ - file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ - file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ - file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ - file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ - file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ - " - - -SRC_URI[md5sum] = "8186ce63c489199b58b6a58ad2a24a94" -SRC_URI[sha256sum] = "cd44df4b23a3e0edc14be63df95d768b9600b31c35be05fb89f93226907fc8c6" diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb new file mode 100644 index 0000000000..e38872bb91 --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb @@ -0,0 +1,12 @@ +require linux-libc-headers.inc + +SRC_URI_append_libc-musl = "\ + file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ + file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ + file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ + file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ + file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ + " + +SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9" +SRC_URI[sha256sum] = "19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1" -- cgit 1.2.3-korg