mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

libc-headers: update to v5.8

Browse Source 
Updating the libc-headers to v5.8. Adjustments to the recipe
include:

The license checksum. Needs to be updated to account for kernel
commit 74835c7db0322b [COPYING: state that all contributions really are
covered by this file].

And the ARM multilib headers need to check the version to adjust for
kernel commit: 541ad0150ca4 [arm: Remove 32bit KVM host support]. We
don't want to break potential other libc-header users, so we check
the version and continue to install the file if the version is less
than v5.8

One patch is refreshed to remove fuzz when building musl.

(From OE-Core rev: 4c3750bbc9dae30d91bd0e5efc8f614810289b31)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield
2020-08-19 09:24:39 -04:00
committed by Richard Purdie
parent c36fb625d1
commit 57d5f4ad41
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/distro/include/tcmode-default.inc
View File

@@ -21,7 +21,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.35%"
GDBVERSION ?= "9.%"
GLIBCVERSION ?= "2.32"
LINUXLIBCVERSION ?= "5.4%"
LINUXLIBCVERSION ?= "5.8%"
QEMUVERSION ?= "5.1%"
GOVERSION ?= "1.14%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote

16
meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
View File

@@ -30,7 +30,7 @@ LICENSE = "GPLv2"
#
# -- RP
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
LIC_FILES_CHKSUM ?= "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
RECIPE_NO_UPDATE_REASON = "Recipe is updated through a separate process"
@@ -46,6 +46,9 @@ python __anonymous () {
d.setVar("HEADER_FETCH_VER", "2.6")
}
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2).split('.')[0]}"
MIN_VER = "${@oe.utils.trim_version("${PV}", 2).split('.')[1]}"
inherit kernel-arch pkgconfig multilib_header
KORG_ARCHIVE_COMPRESSION ?= "xz"
@@ -83,7 +86,16 @@ do_install_append_armeb () {
}
do_install_armmultilib () {
oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h asm/bpf_perf_event.h
if [ ${MAJ_VER} -gt 5 ]; then
ARM_KVM_HEADER=""
else
if [ ${MAJ_VER} -eq 5 ] && [ ${MIN_VER} -ge 8 ]; then
ARM_KVM_HEADER=""
else
ARM_KVM_HEADER="asm/kvm.h"
fi
fi
oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h $ARM_KVM_HEADER asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h asm/bpf_perf_event.h
oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h asm/swab.h asm/types.h asm/unistd.h
}

10
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
View File

@@ -1,4 +1,4 @@
From 9708dc74d9f49488d669e070982f6224a888d61a Mon Sep 17 00:00:00 2001
From dc221138c809125dc1bbff8506c70cb7bd846368 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 12 Sep 2018 17:08:58 -0700
Subject: [PATCH] include linux/stddef.h in swab.h uapi header
@@ -23,12 +23,13 @@ Cc: Philippe Ombredanne <pombredanne@nexb.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
include/uapi/linux/swab.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
index 23cd84868cc3..acddbe50a20d 100644
index 7272f85d6..2912fe463 100644
--- a/include/uapi/linux/swab.h
+++ b/include/uapi/linux/swab.h
@@ -3,6 +3,7 @@
@@ -37,8 +38,5 @@ index 23cd84868cc3..acddbe50a20d 100644
#include <linux/types.h>
+#include <linux/stddef.h>
#include <linux/compiler.h>
#include <asm/bitsperlong.h>
#include <asm/swab.h>
--
2.19.0

6
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb → meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.8.bb
View File

@@ -12,5 +12,7 @@ SRC_URI_append = "\
file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \
"
SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9"
SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
SRC_URI[md5sum] = "0e5c4c15266218ef26c50fac0016095b"
SRC_URI[sha256sum] = "e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5"