summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-01-13 21:34:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-21 08:20:32 +0000
commitf7a99d04e6fb81ffbb14cfa3caaf47e89bb424b5 (patch)
tree1c3af31dd5f3bb84710788b88d8610723206600e /meta
parent6265facc75c3d980dd39494399251bf9121c25cb (diff)
downloadpoky-f7a99d04e6fb81ffbb14cfa3caaf47e89bb424b5.tar.gz
libc-headers: update to v5.4
Updating the libc-headers to match the latest LTS kernel. The delta from previous headers is as follows: - refreshed one patch for 5.4 context - added rsync to the native dependencies, since it is used during header install. Otherwise, everyting is the same. (From OE-Core rev: 35e2cd846a13906c5339c0763ab93d68b122ebc7) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.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.inc2
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch27
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb)4
4 files changed, 16 insertions, 19 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 70ba7d86e9..aba2baaaba 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -21,7 +21,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
21BINUVERSION ?= "2.33%" 21BINUVERSION ?= "2.33%"
22GDBVERSION ?= "8.3%" 22GDBVERSION ?= "8.3%"
23GLIBCVERSION ?= "2.30%" 23GLIBCVERSION ?= "2.30%"
24LINUXLIBCVERSION ?= "5.2%" 24LINUXLIBCVERSION ?= "5.4%"
25QEMUVERSION ?= "4.1%" 25QEMUVERSION ?= "4.1%"
26GOVERSION ?= "1.13%" 26GOVERSION ?= "1.13%"
27# This can not use wildcards like 8.0.% since it is also used in mesa to denote 27# This can not use wildcards like 8.0.% since it is also used in mesa to denote
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 7f838f623e..4481aa430c 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -91,4 +91,4 @@ RDEPENDS_${PN}-dev = ""
91RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" 91RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
92 92
93INHIBIT_DEFAULT_DEPS = "1" 93INHIBIT_DEFAULT_DEPS = "1"
94DEPENDS += "unifdef-native bison-native" 94DEPENDS += "unifdef-native bison-native rsync-native"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch
index 78ebd31e66..54528b6e6a 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch
@@ -24,18 +24,15 @@ Upstream-Status: Submitted [https://www.spinics.net/lists/arm-kernel/msg694800.h
24 scripts/headers_install.sh | 1 + 24 scripts/headers_install.sh | 1 +
25 1 file changed, 1 insertion(+) 25 1 file changed, 1 insertion(+)
26 26
27diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh 27Index: linux-5.4/scripts/headers_install.sh
28index 593f8879c641..fe1d3fc0d33a 100755 28===================================================================
29--- a/scripts/headers_install.sh 29--- linux-5.4.orig/scripts/headers_install.sh
30+++ b/scripts/headers_install.sh 30+++ linux-5.4/scripts/headers_install.sh
31@@ -38,6 +38,7 @@ do 31@@ -36,6 +36,7 @@
32 -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \ 32 s/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g
33 -e 's/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g' \ 33 s/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g
34 -e 's@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @' \ 34 s@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @
35+ -e ':1;s/(#(if|elif)(.*[^A-Za-z0-9_])defined\([[:space:]]*)_UAPI/\1/;t1' \ 35+ :1;s/(#(if|elif)(.*[^A-Za-z0-9_])defined\([[:space:]]*)_UAPI/\1/;t1
36 "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1 36 ' $INFILE > $TMPFILE || exit 1
37 scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \ 37
38 > "$OUTDIR/$FILE" 38 scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE
39--
402.5.0
41
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
index 9d18df76c6..50377394f3 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
@@ -14,5 +14,5 @@ SRC_URI_append = "\
14 file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ 14 file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \
15" 15"
16 16
17SRC_URI[md5sum] = "ddf994de00d7b18395886dd9b30b9262" 17SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9"
18SRC_URI[sha256sum] = "54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7" 18SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-02 22:16:37 +0000