diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-01-13 21:34:03 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-21 08:20:27 +0000 |
| commit | 35e2cd846a13906c5339c0763ab93d68b122ebc7 (patch) | |
| tree | 9e4045eee38017cbc681e3b3bfca8c72b5d51b6b /meta/recipes-kernel | |
| parent | 1098fdf3608f25ae81aa7197a95253c2e61ea9b7 (diff) | |
| download | openembedded-core-contrib-35e2cd846a13906c5339c0763ab93d68b122ebc7.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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch | 27 | ||||
| -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 |
3 files changed, 15 insertions, 18 deletions
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 = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" INHIBIT_DEFAULT_DEPS = "1" -DEPENDS += "unifdef-native bison-native" +DEPENDS += "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 scripts/headers_install.sh | 1 + 1 file changed, 1 insertion(+) -diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh -index 593f8879c641..fe1d3fc0d33a 100755 ---- a/scripts/headers_install.sh -+++ b/scripts/headers_install.sh -@@ -38,6 +38,7 @@ do - -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \ - -e 's/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g' \ - -e 's@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @' \ -+ -e ':1;s/(#(if|elif)(.*[^A-Za-z0-9_])defined\([[:space:]]*)_UAPI/\1/;t1' \ - "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1 - scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \ - > "$OUTDIR/$FILE" --- -2.5.0 - +Index: linux-5.4/scripts/headers_install.sh +=================================================================== +--- linux-5.4.orig/scripts/headers_install.sh ++++ linux-5.4/scripts/headers_install.sh +@@ -36,6 +36,7 @@ + s/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g + s/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g + s@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @ ++ :1;s/(#(if|elif)(.*[^A-Za-z0-9_])defined\([[:space:]]*)_UAPI/\1/;t1 + ' $INFILE > $TMPFILE || exit 1 + + scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE 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 = "\ file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ " -SRC_URI[md5sum] = "ddf994de00d7b18395886dd9b30b9262" -SRC_URI[sha256sum] = "54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7" +SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9" +SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491" |