diff options
Diffstat (limited to 'meta-initramfs/recipes-devtools/klibc/klibc-2.0.4')
20 files changed, 0 insertions, 926 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch deleted file mode 100644 index e7a0cce837..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 57e3a60b23891905733bfea7a1cb78c2377cc524 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 Jul 2017 15:17:29 -0700 -Subject: [PATCH] Define in_* structs for non-glibc system libs - -These defines and structs are required to be coming from -userspace netinet/in.h, which is being overridden in klibc -however, libc-compat.h from kernel is only written keeping -glibc in mind, and does not provide adequate guards for musl -to infer that these structs should be defined in linux/in.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - usr/include/net/if.h | 11 +++++++++++ - 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 @@ - #ifndef _NET_IF_H - #define _NET_IF_H - -+#ifndef __GLIBC__ -+#include <linux/libc-compat.h> -+#undef __UAPI_DEF_IF_IFREQ -+#define __UAPI_DEF_IF_IFREQ 1 -+#undef __UAPI_DEF_IF_IFNAMSIZ -+#define __UAPI_DEF_IF_IFNAMSIZ 1 -+#undef __UAPI_DEF_IF_IFMAP -+#define __UAPI_DEF_IF_IFMAP 1 -+#undef __UAPI_DEF_IF_NET_DEVICE_FLAGS -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 -+#endif - #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 @@ - #ifndef _NETINET_IN_H - #define _NETINET_IN_H - -+#ifndef __GLIBC__ -+#include <linux/libc-compat.h> -+ -+#undef __UAPI_DEF_IN_ADDR -+#undef __UAPI_DEF_IN_IPPROTO -+#undef __UAPI_DEF_IN_PKTINFO -+#undef __UAPI_DEF_IP_MREQ -+#undef __UAPI_DEF_SOCKADDR_IN -+#undef __UAPI_DEF_IN_CLASS -+#undef __UAPI_DEF_IN6_ADDR -+#undef __UAPI_DEF_IN6_ADDR_ALT -+#undef __UAPI_DEF_SOCKADDR_IN6 -+#undef __UAPI_DEF_IPV6_MREQ -+#undef __UAPI_DEF_IPPROTO_V6 -+#undef __UAPI_DEF_IPV6_OPTIONS -+#undef __UAPI_DEF_IN6_PKTINFO -+#undef __UAPI_DEF_IP6_MTUINFO -+#undef __UAPI_DEF_IF_IFREQ -+ -+#define __UAPI_DEF_IN_ADDR 1 -+#define __UAPI_DEF_IN_IPPROTO 1 -+#define __UAPI_DEF_IN_PKTINFO 1 -+#define __UAPI_DEF_IP_MREQ 1 -+#define __UAPI_DEF_SOCKADDR_IN 1 -+#define __UAPI_DEF_IN_CLASS 1 -+#define __UAPI_DEF_IN6_ADDR 1 -+#define __UAPI_DEF_IN6_ADDR_ALT 1 -+#define __UAPI_DEF_SOCKADDR_IN6 1 -+#define __UAPI_DEF_IPV6_MREQ 1 -+#define __UAPI_DEF_IPPROTO_V6 1 -+#define __UAPI_DEF_IPV6_OPTIONS 1 -+#define __UAPI_DEF_IN6_PKTINFO 1 -+#define __UAPI_DEF_IP6_MTUINFO 1 -+#define __UAPI_DEF_IF_IFREQ 1 -+#endif -+ - #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/klibc-2.0.4/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch deleted file mode 100644 index eee144dc4a..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 241f423a015279cb29b7ad1a34386ef1c32007fc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 Dec 2018 16:47:16 -0800 -Subject: [PATCH] Define ulocked_{fgets|fread|fwrite} aliases - -latest clang converts the normal calls to the unlocked variant -equivalents - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Cc: Andrea Adami <andrea.adami@gmail.com> ---- - usr/klibc/fgets.c | 2 ++ - usr/klibc/fread2.c | 2 ++ - usr/klibc/fwrite2.c | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/usr/klibc/fgets.c b/usr/klibc/fgets.c -index dbf742c6..2e9fcb65 100644 ---- a/usr/klibc/fgets.c -+++ b/usr/klibc/fgets.c -@@ -25,3 +25,5 @@ char *fgets(char *s, int n, FILE *f) - - return s; - } -+char *fgets_unlocked(char *s, int n, FILE *f) -+ __alias("fgets"); -diff --git a/usr/klibc/fread2.c b/usr/klibc/fread2.c -index 7dca56b1..5c234766 100644 ---- a/usr/klibc/fread2.c -+++ b/usr/klibc/fread2.c -@@ -11,3 +11,5 @@ size_t fread(void *ptr, size_t size, size_t nmemb, FILE * f) - { - return _fread(ptr, size * nmemb, f) / size; - } -+size_t fread_unlocked(void *ptr, size_t size, size_t nmemb, FILE *f) -+ __alias("fread"); -diff --git a/usr/klibc/fwrite2.c b/usr/klibc/fwrite2.c -index cebc017c..3e0bb57d 100644 ---- a/usr/klibc/fwrite2.c -+++ b/usr/klibc/fwrite2.c -@@ -11,3 +11,5 @@ size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE * f) - { - return _fwrite(ptr, size * nmemb, f) / size; - } -+size_t fwrite_unlocked(void *ptr, size_t size, size_t nmemb, FILE *f) -+ __alias("fwrite"); --- -2.19.2 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch deleted file mode 100644 index 181dcfb6de..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b4147b76518d31a88fb2c58cdbf2236e159a25c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Sep 2017 23:10:54 -0700 -Subject: [PATCH] Kbuild.klibc: Add path to compiler headers via -isystem - -We need to include this path so it can find compiler headers e.g. -stdarg.h which is called from wrapper stdarg.h using include_next - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - scripts/Kbuild.klibc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc -index 101f86f..1d5cdc4 100644 ---- a/scripts/Kbuild.klibc -+++ b/scripts/Kbuild.klibc -@@ -105,7 +105,8 @@ KLIBCOBJCOPY := $(OBJCOPY) - KLIBCOBJDUMP := $(OBJDUMP) - - # klibc include paths --KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ -+KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ -+ -isystem $(shell $(CC) -print-file-name=include) \ - -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ - -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ - -I$(KLIBCOBJ)/../include \ diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch deleted file mode 100644 index 1ba05a811e..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b6185401fc3daa7fa8ba2b84db3e4da3b94a9867 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 26 Jul 2017 16:13:16 -0700 -Subject: [PATCH] Kbuild.klibc: Use -print-libgcc-file-name instead of - --print-libgcc - --print-libgcc-file-name works with clang and gcc unlike --print-libgcc -which is gcc specific - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - scripts/Kbuild.klibc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc -index f500d53..101f86f 100644 ---- a/scripts/Kbuild.klibc -+++ b/scripts/Kbuild.klibc -@@ -128,7 +128,7 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS) \ - KLIBCAFLAGS += -D__ASSEMBLY__ $(KLIBCCFLAGS) - KLIBCSTRIPFLAGS += --strip-all -R .comment -R .note - --KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc) -+KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) -print-libgcc-file-name) - KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) - KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o - KLIBCLIBC := $(KLIBCOBJ)/libc.a diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch deleted file mode 100644 index de04d691fe..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 63ab5102d6ef362a597941e62470bf19e6f1652b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 11 Jul 2017 08:09:52 -0700 -Subject: [PATCH] always use bfd linker - -its possible that distros choose to default to gold linker -therefore explicitly asking for bfd linker would fix the -linking issues on such distros - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index dc10fc5..40647be 100644 ---- a/Makefile -+++ b/Makefile -@@ -20,7 +20,7 @@ include $(srctree)/scripts/Kbuild.include - KLIBCROSS ?= $(CROSS_COMPILE) - export KLIBCROSS - export CC := $(KLIBCROSS)gcc --export LD := $(KLIBCROSS)ld -+export LD := $(KLIBCROSS)ld.bfd - export AR := $(KLIBCROSS)ar - export RANLIB := $(KLIBCROSS)ranlib - export STRIP := $(KLIBCROSS)strip diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch deleted file mode 100644 index fcf4f891a4..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ebd2b0e414c98467156b961abb470b5d07f37ea8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Sep 2017 23:11:53 -0700 -Subject: [PATCH] arm: Do not set a fallback march and mtune - -In OE we pass the options explicitly, there is -no need to set it inside the makefiles, we will -need to compute values for CPU_ARCH and CPU_TUNE -which is a bit harder in OE - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - usr/klibc/arch/arm/MCONFIG | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG -index 303c6ac..48d2685 100644 ---- a/usr/klibc/arch/arm/MCONFIG -+++ b/usr/klibc/arch/arm/MCONFIG -@@ -10,7 +10,7 @@ - CPU_ARCH ?= armv4 - CPU_TUNE ?= strongarm - --KLIBCOPTFLAGS += -Os -march=$(CPU_ARCH) -mtune=$(CPU_TUNE) -+KLIBCOPTFLAGS += -Os - KLIBCBITSIZE = 32 - KLIBCREQFLAGS += -fno-exceptions - KLIBCSTRIPFLAGS += -R .ARM.exidx diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch deleted file mode 100644 index 46a23987f5..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/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/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch deleted file mode 100644 index 04c97fc5ee..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d966d52d1e569cbc2293d841285e2b8941f28c61 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 Jul 2017 15:56:28 -0700 -Subject: [PATCH] include linux/sysinfo.h directly - -This is done to avoid the kernel header linux/kernel.h to use -__GLIBC__ define to decide on if libc implements sysinfo() API -or not. Kernel headers should be independent of such assumptions -but until its done in right place, change the local header -override to avoid this assumption - -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 - #define _SYS_SYSINFO_H - --#include <linux/kernel.h> -+#include <linux/sysinfo.h> - - extern int sysinfo(struct sysinfo *info); - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch deleted file mode 100644 index 94818e3669..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cdc6edc2cfcd0ce88d6e66654d605dad303b1a75 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 11 Sep 2018 17:03:36 -0700 -Subject: [PATCH] klibc/Kbuild: Accept EXTRA_KLIBCAFLAGS - -For passing additional assembler flags - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - usr/klibc/Kbuild | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild -index 98caf2e9..b34521e0 100644 ---- a/usr/klibc/Kbuild -+++ b/usr/klibc/Kbuild -@@ -168,7 +168,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash - targets += interp.o - - quiet_cmd_interp = BUILD $@ -- cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \ -+ cmd_interp = $(KLIBCCC) $(klibccflags) $(EXTRA_KLIBCAFLAGS) \ -+ -D__ASSEMBLY__ \ - -DLIBDIR=\"$(SHLIBDIR)\" \ - -DSOHASH=\"$(SOLIBHASH)\" \ - -c -o $@ $< diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-add-getrandom-syscall.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-add-getrandom-syscall.patch deleted file mode 100644 index 0768f6d514..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-add-getrandom-syscall.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e4d5d5224609d7d5c824dd231f5baec868befdfa Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Tue, 4 Sep 2018 23:56:00 +0200 -Subject: [PATCH 1/1] klibc: add getrandom() syscall - -needed by latest kexec-tools for qemuarm64 (kashan) - -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - usr/klibc/SYSCALLS.def | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def -index 6b3bf4c..d4184ba 100644 ---- a/usr/klibc/SYSCALLS.def -+++ b/usr/klibc/SYSCALLS.def -@@ -274,6 +274,7 @@ int syslog::klogctl(int, char *, int); - int sysinfo(struct sysinfo *); - long kexec_load(void *, unsigned long, struct kexec_segment *, unsigned long); - <x86_64,ppc64,s390x> long kexec_file_load(int, int, unsigned long, const char *, unsigned long); -+ssize_t getrandom(void *, size_t, unsigned int); - - /* - * Low-level I/O (generally architecture-specific); --- -2.7.4 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-static-utils-do-not-build-shared-binaries.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-static-utils-do-not-build-shared-binaries.patch deleted file mode 100644 index 2f7cd35564..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-static-utils-do-not-build-shared-binaries.patch +++ /dev/null @@ -1,213 +0,0 @@ -From c034dceae17b7d8d437871afe5eba55a55434222 Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Wed, 10 Oct 2018 00:48:31 +0200 -Subject: [PATCH] klibc-static-utils: do not build shared binaries - -We were building some shared utilities and this was leading to linker errors -for x86 with security flags enabled. - -Fix - i586-oe-linux-musl-ld.bfd: discarded output section: `.got.plt' - -Upstream-Status: Inappropriate [Embedded Specific] - -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - usr/dash/Kbuild | 6 +----- - usr/kinit/Kbuild | 4 +--- - usr/kinit/fstype/Kbuild | 4 +--- - usr/kinit/ipconfig/Kbuild | 4 +--- - usr/kinit/nfsmount/Kbuild | 4 +--- - usr/kinit/resume/Kbuild | 5 +---- - usr/kinit/run-init/Kbuild | 5 +---- - usr/utils/Kbuild | 7 ++----- - 8 files changed, 9 insertions(+), 30 deletions(-) - -diff --git a/usr/dash/Kbuild b/usr/dash/Kbuild -index 1a6920a..b3a4e64 100644 ---- a/usr/dash/Kbuild -+++ b/usr/dash/Kbuild -@@ -25,12 +25,8 @@ gen-h-files := builtins.h nodes.h syntax.h token.h - - static-y := sh - --# The shared binary --shared-y := sh.shared --sh.shared-y := $(sh-y) -- - # For cleaning --targets := sh sh.g sh.shared sh.shared.g $(gen-o-files) -+targets := sh sh.g $(gen-o-files) - - # explicit dependency for all generated files - $(addprefix $(obj)/, $(sh-y)): $(addprefix $(obj)/, $(gen-h-files)) -diff --git a/usr/kinit/Kbuild b/usr/kinit/Kbuild -index f7fdccd..8db06ab 100644 ---- a/usr/kinit/Kbuild -+++ b/usr/kinit/Kbuild -@@ -18,8 +18,6 @@ kinit-y += fstype/ - kinit-y += resume/ - - static-y := kinit --shared-y := kinit.shared --kinit.shared-y := $(kinit-y) - - # Additional include paths files - KLIBCCFLAGS += -I$(srctree)/$(src)/fstype \ -@@ -29,7 +27,7 @@ KLIBCCFLAGS += -I$(srctree)/$(src)/fstype \ - -I$(srctree)/$(src)/run-init - - # Cleaning --targets += kinit kinit.g kinit.shared kinit.shared.g -+targets += kinit kinit.g - subdir- := fstype ipconfig nfsmount resume run-init - - -diff --git a/usr/kinit/fstype/Kbuild b/usr/kinit/fstype/Kbuild -index 367611d..8d453ea 100644 ---- a/usr/kinit/fstype/Kbuild -+++ b/usr/kinit/fstype/Kbuild -@@ -3,7 +3,6 @@ - # - - static-y := static/fstype --shared-y := shared/fstype - - # common .o files - objs := main.o fstype.o -@@ -16,8 +15,7 @@ lib-y := $(objs) - - # .o files used to built executables - static/fstype-y := $(objs) --shared/fstype-y := $(objs) - - # Cleaning --clean-dirs := static shared -+clean-dirs := static - -diff --git a/usr/kinit/ipconfig/Kbuild b/usr/kinit/ipconfig/Kbuild -index eb1d472..ef87e7e 100644 ---- a/usr/kinit/ipconfig/Kbuild -+++ b/usr/kinit/ipconfig/Kbuild -@@ -3,7 +3,6 @@ - # - - static-y := static/ipconfig --shared-y := shared/ipconfig - - # common .o files - objs := main.o netdev.o packet.o -@@ -22,8 +21,7 @@ lib-y := $(objs) - - # .o files used to built executables - static/ipconfig-y := $(objs) --shared/ipconfig-y := $(objs) - - # Cleaning --clean-dirs := static shared -+clean-dirs := static - -diff --git a/usr/kinit/nfsmount/Kbuild b/usr/kinit/nfsmount/Kbuild -index ba31708..01bedce 100644 ---- a/usr/kinit/nfsmount/Kbuild -+++ b/usr/kinit/nfsmount/Kbuild -@@ -4,7 +4,6 @@ - - static-y := static/nfsmount - #FIXME - build is broken static-y := dummypmap --shared-y := shared/nfsmount - - objs := main.o mount.o portmap.o dummypmap.o sunrpc.o - -@@ -13,7 +12,6 @@ lib-y := $(objs) - - # .o files used for executables - static/nfsmount-y := $(objs) --shared/nfsmount-y := $(objs) - - # dummypmap uses a single .o file (rename src file?) - dummypmap-y := dummypmap_test.o -@@ -21,5 +19,5 @@ dummypmap-y := dummypmap_test.o - # TODO - do we want a stripped version - # TODO - do we want the static.g + shared.g directories? - --clean-dirs := static shared -+clean-dirs := static - -diff --git a/usr/kinit/resume/Kbuild b/usr/kinit/resume/Kbuild -index c1342e1..15b9590 100644 ---- a/usr/kinit/resume/Kbuild -+++ b/usr/kinit/resume/Kbuild -@@ -3,7 +3,6 @@ - # - - static-y := static/resume --shared-y := shared/resume - - # common .o files - objs := resume.o resumelib.o -@@ -20,9 +19,7 @@ KLIBCCFLAGS += -I$(srctree)/$(src)/.. - # .o files used to built executables - static/resume-y := $(objs) - static/resume-lib := ../lib.a --shared/resume-y := $(objs) --shared/resume-lib := ../lib.a - - # Cleaning --clean-dirs := static shared -+clean-dirs := static - -diff --git a/usr/kinit/run-init/Kbuild b/usr/kinit/run-init/Kbuild -index c153b0a..a1ea834 100644 ---- a/usr/kinit/run-init/Kbuild -+++ b/usr/kinit/run-init/Kbuild -@@ -3,7 +3,6 @@ - # - - static-y := static/run-init --shared-y := shared/run-init - - # common .o files - objs := run-init.o runinitlib.o -@@ -24,9 +23,7 @@ KLIBCCFLAGS += -I$(srctree)/$(src)/.. - # .o files used to built executables - static/run-init-y := $(objs) - static/run-init-lib := ../lib.a --shared/run-init-y := $(objs) --shared/run-init-lib := ../lib.a - - # Cleaning --clean-dirs := static shared -+clean-dirs := static - -diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild -index 67d9486..1573363 100644 ---- a/usr/utils/Kbuild -+++ b/usr/utils/Kbuild -@@ -7,7 +7,6 @@ progs += true false sleep ln mv nuke minips cat ls losetup - progs += uname halt kill readlink cpio sync dmesg - - static-y := $(addprefix static/, $(progs)) --shared-y := $(addprefix shared/, $(progs)) - - # The binary is placed in a subdir, so we need to tell kbuild this - static/chroot-y := chroot.o -@@ -62,13 +61,11 @@ static/losetup-y := losetup.o - shared/losetup-y := losetup.o - - # Additionally linked targets --always := static/reboot static/poweroff shared/reboot shared/poweroff -+always := static/reboot static/poweroff - - $(obj)/static/reboot $(obj)/static/poweroff: $(obj)/static/halt - $(call cmd,ln) --$(obj)/shared/reboot $(obj)/shared/poweroff: $(obj)/shared/halt -- $(call cmd,ln) - - # Clean deletes the static and shared dir --clean-dirs := static shared -+clean-dirs := static - --- -2.7.4 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch deleted file mode 100644 index 3d8d987c43..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 90683d5eaabfa684a71411d6e3262153ac191ad8 Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Tue, 4 Sep 2018 23:44:30 +0200 -Subject: [PATCH 1/1] klibc_2.0.4: add kexec_file_load syscall - -for supported archs only (matched in kexec-tools) - -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - usr/klibc/SYSCALLS.def | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def -index c56e8f9..6b3bf4c 100644 ---- a/usr/klibc/SYSCALLS.def -+++ b/usr/klibc/SYSCALLS.def -@@ -273,6 +273,7 @@ int reboot::__reboot(int, int, int, void *); - int syslog::klogctl(int, char *, int); - int sysinfo(struct sysinfo *); - long kexec_load(void *, unsigned long, struct kexec_segment *, unsigned long); -+<x86_64,ppc64,s390x> long kexec_file_load(int, int, unsigned long, const char *, unsigned long); - - /* - * Low-level I/O (generally architecture-specific); --- -2.7.4 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch deleted file mode 100644 index 3bc081d4e9..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cf97079009ba48d10e52052b2eab7461ea4dd09b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 10 Jul 2017 20:42:50 -0700 -Subject: [PATCH] mkfifo: Implement mkfifo - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - usr/utils/mkfifo.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/usr/utils/mkfifo.c b/usr/utils/mkfifo.c -index 5a758b2..f1f577e 100644 ---- a/usr/utils/mkfifo.c -+++ b/usr/utils/mkfifo.c -@@ -26,6 +26,11 @@ static int make_fifo(char *dir) - return 0; - } - -+int mkfifo (const char *__p, mode_t __m) -+{ -+ return mknod(__p, (__m & ~S_IFMT) | S_IFIFO, (dev_t) 0); -+} -+ - int main(int argc, char *argv[]) - { - int c, ret = 0; diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch deleted file mode 100644 index e842353061..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d2fb484d995221277cce7abddcd7dfa0e8bceec3 Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Fri, 11 Jan 2013 17:26:40 +0000 -Subject: [PATCH] klibc_2.0.2: apply FIX_V4BX patch for armv4 targets only - -Status: not applicable upstream, in OE/Yocto we use $(FIX_V4BX) -which is "" in case of armv5 or thumbs. - -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> - ---- - usr/klibc/arch/arm/MCONFIG | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG -index 53bc1dc..303c6ac 100644 ---- a/usr/klibc/arch/arm/MCONFIG -+++ b/usr/klibc/arch/arm/MCONFIG -@@ -29,6 +29,7 @@ else - KLIBCSHAREDFLAGS = -Ttext 0x01800200 - ifeq ($(CONFIG_AEABI),y) - KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork -+KLIBCLDFLAGS += $(FIX_ARMV4_EABI_BX) - else - KLIBCREQFLAGS += -mabi=apcs-gnu -mno-thumb-interwork - endif diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch deleted file mode 100644 index 5f47d3f20a..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0cb26cf2d25d36c1fdcc4f1635e4329436ed866a Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Fri, 19 Sep 2014 23:09:29 +0200 - ---- - klcc/klcc.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/klcc/klcc.in b/klcc/klcc.in -index 43d0984..61e9385 100644 ---- a/klcc/klcc.in -+++ b/klcc/klcc.in -@@ -204,6 +204,9 @@ while ( defined($a = shift(@ARGV)) ) { - # Libraries - push(@libs, $a); - push(@libs, shift(@ARGV)) if ( $2 eq '' ); -+ } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) { -+ # Override gcc encoded sysroot -+ push(@ccopt, $a); - } else { - die "$0: unknown option: $a\n"; - } diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-cross-accept-clang-options.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-cross-accept-clang-options.patch deleted file mode 100644 index 07703aa536..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-cross-accept-clang-options.patch +++ /dev/null @@ -1,19 +0,0 @@ -meta-clang passes this option to compiler defaults - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: git/klcc/klcc.in -=================================================================== ---- git.orig/klcc/klcc.in -+++ git/klcc/klcc.in -@@ -207,6 +207,9 @@ while ( defined($a = shift(@ARGV)) ) { - } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) { - # Override gcc encoded sysroot - push(@ccopt, $a); -+ } elsif ( $a eq '-no-integrated-as' ) { -+ # Allow clang options -+ push(@ccopt, $a); - } else { - die "$0: unknown option: $a\n"; - } diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch deleted file mode 100644 index f28cd54233..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1118cc971917abe19ddb029aa80417f6fd6bb343 Mon Sep 17 00:00:00 2001 -From: Thomas Kunze <thommycheck@gmx.de> -Date: Sat, 6 Aug 2011 05:30:14 +0000 -Subject: [PATCH] klibc: initial commit of version 1.5.24 - -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id b6764cf32ec93547531130dca364fb95e1c495f4 -Signed-off-by: Thomas Kunze <thommycheck@gmx.de> - ---- - defconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/defconfig b/defconfig -index 04b98e9..0cb23d0 100644 ---- a/defconfig -+++ b/defconfig -@@ -6,4 +6,4 @@ CONFIG_KLIBC_ZLIB=y - CONFIG_REGPARM=y - # ARM options - # CONFIG_KLIBC_THUMB is not set --# CONFIG_AEABI is not set -+CONFIG_AEABI=y diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch deleted file mode 100644 index a5563b7407..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1be2bc41f915922102a3ba671b54c2df6f0052e6 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings <ben@decadent.org.uk> -Date: Sun, 14 Mar 2010 18:41:56 +0000 -Subject: [PATCH] klibc_1.5.26: now build against linux-libc-headers - -commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a - - Taken from debian "Fix klibc Debian specific build trouble" - Adapted for klibc_2.0.2 - ---- - scripts/Kbuild.install | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install -index 8af5697..d32a8a5 100644 ---- a/scripts/Kbuild.install -+++ b/scripts/Kbuild.install -@@ -95,7 +95,9 @@ header: - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin -- $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install -+ $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \ -+ ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ -+ done - $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. - $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch deleted file mode 100644 index 5c7a6625b5..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 1892079b827cf8f8316305b6d6e0985db82441a2 Mon Sep 17 00:00:00 2001 -From: Thomas Kunze <thommycheck@gmx.de> -Date: Sat, 6 Aug 2011 05:30:14 +0000 -Subject: [PATCH] klibc: initial commit of version 1.5.24 - -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id eefb99a313bbcc8f34c8b32bf0c5aa2dd2580735 -Signed-off-by: Thomas Kunze <thommycheck@gmx.de> - -Minor edits following upstream changes -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> - ---- - scripts/Kbuild.install | 4 ---- - usr/dash/Kbuild | 2 -- - usr/gzip/Kbuild | 2 -- - usr/kinit/Kbuild | 2 -- - usr/kinit/fstype/Kbuild | 2 -- - usr/kinit/ipconfig/Kbuild | 2 -- - usr/kinit/nfsmount/Kbuild | 2 -- - usr/kinit/resume/Kbuild | 2 -- - usr/kinit/run-init/Kbuild | 2 -- - usr/klibc/Kbuild | 2 -- - usr/utils/Kbuild | 2 -- - 11 files changed, 24 deletions(-) - -diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install -index d32a8a5..fda699d 100644 ---- a/scripts/Kbuild.install -+++ b/scripts/Kbuild.install -@@ -88,19 +88,15 @@ else - header: - $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)" - $(Q)mkdir -p $(INSTALLROOT)$(bindir) -- $(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1 -- $(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR) - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR) - $(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib -- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin - $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \ - ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ - done - $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. - $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include -- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 - $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) - - footer: header -diff --git a/usr/dash/Kbuild b/usr/dash/Kbuild -index 3a98c1f..1a6920a 100644 ---- a/usr/dash/Kbuild -+++ b/usr/dash/Kbuild -@@ -92,5 +92,3 @@ $(obj)/syntax.c: $(obj)/mksyntax - $(obj)/syntax.h: $(obj)/syntax.c - $(Q): - --# Targets to install --install-y := sh.shared -diff --git a/usr/gzip/Kbuild b/usr/gzip/Kbuild -index 9bbf0a4..c497d02 100644 ---- a/usr/gzip/Kbuild -+++ b/usr/gzip/Kbuild -@@ -21,5 +21,3 @@ $(obj)/gunzip $(obj)/zcat: $(obj)/gzip - # Cleaning - targets := gzip gzip.g gunzip zcat - --# Targets to install --install-y := gzip gunzip zcat -diff --git a/usr/kinit/Kbuild b/usr/kinit/Kbuild -index 5320127..f7fdccd 100644 ---- a/usr/kinit/Kbuild -+++ b/usr/kinit/Kbuild -@@ -33,5 +33,3 @@ targets += kinit kinit.g kinit.shared kinit.shared.g - subdir- := fstype ipconfig nfsmount resume run-init - - --# install binary --install-y := kinit kinit.shared -diff --git a/usr/kinit/fstype/Kbuild b/usr/kinit/fstype/Kbuild -index 9b20db1..367611d 100644 ---- a/usr/kinit/fstype/Kbuild -+++ b/usr/kinit/fstype/Kbuild -@@ -21,5 +21,3 @@ shared/fstype-y := $(objs) - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -diff --git a/usr/kinit/ipconfig/Kbuild b/usr/kinit/ipconfig/Kbuild -index 7f8d181..eb1d472 100644 ---- a/usr/kinit/ipconfig/Kbuild -+++ b/usr/kinit/ipconfig/Kbuild -@@ -27,5 +27,3 @@ shared/ipconfig-y := $(objs) - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -diff --git a/usr/kinit/nfsmount/Kbuild b/usr/kinit/nfsmount/Kbuild -index 461e6f3..ba31708 100644 ---- a/usr/kinit/nfsmount/Kbuild -+++ b/usr/kinit/nfsmount/Kbuild -@@ -23,5 +23,3 @@ dummypmap-y := dummypmap_test.o - - clean-dirs := static shared - --# Install binary --install-y := $(shared-y) -diff --git a/usr/kinit/resume/Kbuild b/usr/kinit/resume/Kbuild -index 034195d..c1342e1 100644 ---- a/usr/kinit/resume/Kbuild -+++ b/usr/kinit/resume/Kbuild -@@ -26,5 +26,3 @@ shared/resume-lib := ../lib.a - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -diff --git a/usr/kinit/run-init/Kbuild b/usr/kinit/run-init/Kbuild -index f7832b7..c153b0a 100644 ---- a/usr/kinit/run-init/Kbuild -+++ b/usr/kinit/run-init/Kbuild -@@ -30,5 +30,3 @@ shared/run-init-lib := ../lib.a - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild -index eba6add..98caf2e 100644 ---- a/usr/klibc/Kbuild -+++ b/usr/klibc/Kbuild -@@ -185,5 +185,3 @@ install-rule: - $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib)) - $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ - $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib -- $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ -- $(INSTALLROOT)$(SHLIBDIR) -diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild -index 05aa794..67d9486 100644 ---- a/usr/utils/Kbuild -+++ b/usr/utils/Kbuild -@@ -72,5 +72,3 @@ $(obj)/shared/reboot $(obj)/shared/poweroff: $(obj)/shared/halt - # Clean deletes the static and shared dir - clean-dirs := static shared - --# install only install the shared binaries --install-y := $(shared-y) shared/reboot shared/poweroff diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/use-env-for-perl.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/use-env-for-perl.patch deleted file mode 100644 index eac128cc09..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/use-env-for-perl.patch +++ /dev/null @@ -1,25 +0,0 @@ -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id 676cbb54d42c89a4832871064cfcb7ee2ad372ee - -klcc-cross: Add patch to use /usr/bin/env perl -Certain configurations (such as autobuilders) may build in very -deep paths (that are longer than the #! mechanism allows) which -makes it unsafe to use the direct path for perl. In our case we know -that /usr/bin/env perl will always return ours (if it has been built). - -Signed-off-by: Tom Rini <tom_rini@mentor.com> - -Index: klibc-1.5.20/klcc/makeklcc.pl -=================================================================== ---- a/klcc/makeklcc.pl -+++ b/klcc/makeklcc.pl -@@ -26,7 +26,7 @@ sub pathsearch($) { - return undef; - } - --print "#!${perlpath}\n"; -+print "#!/usr/bin/env perl\n"; - - open(KLIBCCONF, "< $klibcconf\0") - or die "$0: cannot open $klibcconf: $!\n"; |