diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-08-09 07:25:37 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-08-10 08:48:30 -0700 |
commit | 8204ee52dea70f19e39f8f0affcb4e4edb203f8c (patch) | |
tree | e52f38d6596a24cce29011a91c201318efd16563 /meta-initramfs/recipes-devtools | |
parent | bc2b1482a0a79a6ff7a9211d9a06f3d637ab9e3d (diff) | |
download | meta-openembedded-contrib-8204ee52dea70f19e39f8f0affcb4e4edb203f8c.tar.gz |
klibc: Upgrade to 2.0.10
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-initramfs/recipes-devtools')
11 files changed, 9 insertions, 50 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-Define-in_-structs-for-non-glibc-system-libs.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-Define-in_-structs-for-non-glibc-system-libs.patch index e7a0cce837..29873cf7b5 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-Define-in_-structs-for-non-glibc-system-libs.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-Define-in_-structs-for-non-glibc-system-libs.patch @@ -16,8 +16,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> usr/include/netinet/in.h | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) -diff --git a/usr/include/net/if.h b/usr/include/net/if.h -index 116a176..6246b12 100644 --- a/usr/include/net/if.h +++ b/usr/include/net/if.h @@ -1,6 +1,17 @@ @@ -38,8 +36,6 @@ index 116a176..6246b12 100644 #include <sys/socket.h> #include <sys/types.h> #include <linux/if.h> -diff --git a/usr/include/netinet/in.h b/usr/include/netinet/in.h -index 2952bb2..0c95bc9 100644 --- a/usr/include/netinet/in.h +++ b/usr/include/netinet/in.h @@ -5,6 +5,42 @@ @@ -82,6 +78,6 @@ index 2952bb2..0c95bc9 100644 +#define __UAPI_DEF_IF_IFREQ 1 +#endif + + #include <sys/types.h> #include <klibc/extern.h> #include <stdint.h> - #include <endian.h> /* Must be included *before* <linux/in.h> */ diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-dash-Specify-format-string-in-fmtstr.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-dash-Specify-format-string-in-fmtstr.patch deleted file mode 100644 index 46a23987f5..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-dash-Specify-format-string-in-fmtstr.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8beffe501c1ac5b35d62004735c4157c74183901 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 Jul 2017 13:51:25 -0700 -Subject: [PATCH] dash: Specify format string in fmtstr() - -Fixes build with hardening flags - -usr/dash/jobs.c:429:3: error: format not a string literal and no format arguments [-Werror=format-security] - col = fmtstr(s, 32, strsignal(st)); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - usr/dash/jobs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/usr/dash/jobs.c b/usr/dash/jobs.c -index 009bbfe..299bcac 100644 ---- a/usr/dash/jobs.c -+++ b/usr/dash/jobs.c -@@ -426,7 +426,7 @@ sprint_status(char *s, int status, int sigonly) - goto out; - #endif - } -- col = fmtstr(s, 32, strsignal(st)); -+ col = fmtstr(s, 32, "%s", strsignal(st)); - #ifdef WCOREDUMP - if (WCOREDUMP(status)) { - col += fmtstr(s + col, 16, " (core dumped)"); diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-include-linux-sysinfo.h-directly.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-include-linux-sysinfo.h-directly.patch index 04c97fc5ee..d58229681d 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-include-linux-sysinfo.h-directly.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-include-linux-sysinfo.h-directly.patch @@ -15,14 +15,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> usr/include/sys/sysinfo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/usr/include/sys/sysinfo.h b/usr/include/sys/sysinfo.h -index dba68dc..d145c0b 100644 --- a/usr/include/sys/sysinfo.h +++ b/usr/include/sys/sysinfo.h -@@ -5,7 +5,7 @@ - #ifndef _SYS_SYSINFO_H +@@ -6,7 +6,7 @@ #define _SYS_SYSINFO_H + #include <sys/types.h> -#include <linux/kernel.h> +#include <linux/sysinfo.h> diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-workaround-for-overlapping-sections-in-binary.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-workaround-for-overlapping-sections-in-binary.patch index 8ccfe447ee..2f203ef0a4 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-workaround-for-overlapping-sections-in-binary.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-workaround-for-overlapping-sections-in-binary.patch @@ -34,19 +34,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> usr/klibc/syscalls/Kbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/usr/klibc/syscalls/Kbuild b/usr/klibc/syscalls/Kbuild -index 2430b9b4..754d028e 100644 --- a/usr/klibc/syscalls/Kbuild +++ b/usr/klibc/syscalls/Kbuild -@@ -71,7 +71,7 @@ $(obj)/typesize.c: $(srctree)/$(KLIBCSRC)/syscalls.pl $(obj)/SYSCALLS.i \ +@@ -71,7 +71,7 @@ $(obj)/typesize.c: $(srctree)/$(KLIBCSRC # Convert typesize.o to typesize.bin quiet_cmd_mkbin = OBJCOPY $@ -- cmd_mkbin = $(KLIBCOBJCOPY) -O binary $< $@ +- cmd_mkbin = $(KLIBCOBJCOPY) -O binary --only-section .rodata $< $@ + cmd_mkbin = $(KLIBCOBJCOPY) -O binary --remove-section .note.gnu.property $< $@ $(obj)/typesize.bin: $(obj)/typesize.o FORCE $(call if_changed,mkbin) --- -2.30.0 - diff --git a/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch b/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch index 4a334fa252..6c734dfd6e 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch @@ -14,8 +14,8 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- a/usr/klibc/arch/arm/MCONFIG +++ b/usr/klibc/arch/arm/MCONFIG -@@ -29,6 +29,7 @@ else - KLIBCSHAREDFLAGS = -Ttext-segment 0x01800000 +@@ -27,6 +27,7 @@ else + KLIBCSHAREDFLAGS = $(LD_IMAGE_BASE_OPT) 0x01800000 ifeq ($(CONFIG_AEABI),y) KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork +KLIBCLDFLAGS += $(FIX_ARMV4_EABI_BX) diff --git a/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch b/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch index 69799c5c76..41936c9fe3 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch @@ -6,7 +6,7 @@ -I$(KLIBCOBJ)/../include \ - -I$(KLIBCINC) -ifeq ($(cc-name),clang) --KLIBCCPPFLAGS += -I$(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-file-name=include) +-KLIBCCPPFLAGS += -isystem $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-file-name=include) -endif + -I$(KLIBCINC) \ + -I$(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-file-name=include) diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.8.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb index 4011aa231e..4011aa231e 100644 --- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.8.bb +++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb index 0de580781b..0de580781b 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb index 2f26093cbe..2f26093cbe 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index ceb4f5ad3b..4c915af2fa 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -10,7 +10,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/2.0/klibc-${PV}.tar.xz \ ${ARMPATCHES} \ file://klcc-consider-sysroot.patch \ file://klcc-cross-accept-clang-options.patch \ - file://0001-dash-Specify-format-string-in-fmtstr.patch \ file://0001-Define-in_-structs-for-non-glibc-system-libs.patch \ file://0001-include-linux-sysinfo.h-directly.patch \ file://0001-mkfifo-Implement-mkfifo.patch \ @@ -28,7 +27,7 @@ ARMPATCHES ?= "" ARMPATCHES:arm = " \ file://armv4-fix-v4bx.patch \ " -SRC_URI[sha256sum] = "4e48f1398cfe3ce0b6df55ce6e70acf54fc8488e3aea3fb3610ee1622d9cb436" +SRC_URI[sha256sum] = "662753da8889e744dfc0db6eb4021c3377ee7ef8ed66d7d57765f8c9e25939cd" S = "${WORKDIR}/klibc-${PV}" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb index 8dda9a8cdc..8dda9a8cdc 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb |