summaryrefslogtreecommitdiffstats
path: root/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4
diff options
context:
space:
mode:
Diffstat (limited to 'meta-initramfs/recipes-devtools/klibc/klibc-2.0.4')
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch87
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch49
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch28
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch28
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch28
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch29
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch29
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch30
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch28
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-add-getrandom-syscall.patch27
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-static-utils-do-not-build-shared-binaries.patch213
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch27
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch27
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch26
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch22
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-cross-accept-clang-options.patch19
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch24
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch29
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch151
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/use-env-for-perl.patch25
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 @@
1From 57e3a60b23891905733bfea7a1cb78c2377cc524 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 9 Jul 2017 15:17:29 -0700
4Subject: [PATCH] Define in_* structs for non-glibc system libs
5
6These defines and structs are required to be coming from
7userspace netinet/in.h, which is being overridden in klibc
8however, libc-compat.h from kernel is only written keeping
9glibc in mind, and does not provide adequate guards for musl
10to infer that these structs should be defined in linux/in.h
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14---
15 usr/include/net/if.h | 11 +++++++++++
16 usr/include/netinet/in.h | 36 ++++++++++++++++++++++++++++++++++++
17 2 files changed, 47 insertions(+)
18
19diff --git a/usr/include/net/if.h b/usr/include/net/if.h
20index 116a176..6246b12 100644
21--- a/usr/include/net/if.h
22+++ b/usr/include/net/if.h
23@@ -1,6 +1,17 @@
24 #ifndef _NET_IF_H
25 #define _NET_IF_H
26
27+#ifndef __GLIBC__
28+#include <linux/libc-compat.h>
29+#undef __UAPI_DEF_IF_IFREQ
30+#define __UAPI_DEF_IF_IFREQ 1
31+#undef __UAPI_DEF_IF_IFNAMSIZ
32+#define __UAPI_DEF_IF_IFNAMSIZ 1
33+#undef __UAPI_DEF_IF_IFMAP
34+#define __UAPI_DEF_IF_IFMAP 1
35+#undef __UAPI_DEF_IF_NET_DEVICE_FLAGS
36+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
37+#endif
38 #include <sys/socket.h>
39 #include <sys/types.h>
40 #include <linux/if.h>
41diff --git a/usr/include/netinet/in.h b/usr/include/netinet/in.h
42index 2952bb2..0c95bc9 100644
43--- a/usr/include/netinet/in.h
44+++ b/usr/include/netinet/in.h
45@@ -5,6 +5,42 @@
46 #ifndef _NETINET_IN_H
47 #define _NETINET_IN_H
48
49+#ifndef __GLIBC__
50+#include <linux/libc-compat.h>
51+
52+#undef __UAPI_DEF_IN_ADDR
53+#undef __UAPI_DEF_IN_IPPROTO
54+#undef __UAPI_DEF_IN_PKTINFO
55+#undef __UAPI_DEF_IP_MREQ
56+#undef __UAPI_DEF_SOCKADDR_IN
57+#undef __UAPI_DEF_IN_CLASS
58+#undef __UAPI_DEF_IN6_ADDR
59+#undef __UAPI_DEF_IN6_ADDR_ALT
60+#undef __UAPI_DEF_SOCKADDR_IN6
61+#undef __UAPI_DEF_IPV6_MREQ
62+#undef __UAPI_DEF_IPPROTO_V6
63+#undef __UAPI_DEF_IPV6_OPTIONS
64+#undef __UAPI_DEF_IN6_PKTINFO
65+#undef __UAPI_DEF_IP6_MTUINFO
66+#undef __UAPI_DEF_IF_IFREQ
67+
68+#define __UAPI_DEF_IN_ADDR 1
69+#define __UAPI_DEF_IN_IPPROTO 1
70+#define __UAPI_DEF_IN_PKTINFO 1
71+#define __UAPI_DEF_IP_MREQ 1
72+#define __UAPI_DEF_SOCKADDR_IN 1
73+#define __UAPI_DEF_IN_CLASS 1
74+#define __UAPI_DEF_IN6_ADDR 1
75+#define __UAPI_DEF_IN6_ADDR_ALT 1
76+#define __UAPI_DEF_SOCKADDR_IN6 1
77+#define __UAPI_DEF_IPV6_MREQ 1
78+#define __UAPI_DEF_IPPROTO_V6 1
79+#define __UAPI_DEF_IPV6_OPTIONS 1
80+#define __UAPI_DEF_IN6_PKTINFO 1
81+#define __UAPI_DEF_IP6_MTUINFO 1
82+#define __UAPI_DEF_IF_IFREQ 1
83+#endif
84+
85 #include <klibc/extern.h>
86 #include <stdint.h>
87 #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 @@
1From 241f423a015279cb29b7ad1a34386ef1c32007fc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 9 Dec 2018 16:47:16 -0800
4Subject: [PATCH] Define ulocked_{fgets|fread|fwrite} aliases
5
6latest clang converts the normal calls to the unlocked variant
7equivalents
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Cc: Andrea Adami <andrea.adami@gmail.com>
11---
12 usr/klibc/fgets.c | 2 ++
13 usr/klibc/fread2.c | 2 ++
14 usr/klibc/fwrite2.c | 2 ++
15 3 files changed, 6 insertions(+)
16
17diff --git a/usr/klibc/fgets.c b/usr/klibc/fgets.c
18index dbf742c6..2e9fcb65 100644
19--- a/usr/klibc/fgets.c
20+++ b/usr/klibc/fgets.c
21@@ -25,3 +25,5 @@ char *fgets(char *s, int n, FILE *f)
22
23 return s;
24 }
25+char *fgets_unlocked(char *s, int n, FILE *f)
26+ __alias("fgets");
27diff --git a/usr/klibc/fread2.c b/usr/klibc/fread2.c
28index 7dca56b1..5c234766 100644
29--- a/usr/klibc/fread2.c
30+++ b/usr/klibc/fread2.c
31@@ -11,3 +11,5 @@ size_t fread(void *ptr, size_t size, size_t nmemb, FILE * f)
32 {
33 return _fread(ptr, size * nmemb, f) / size;
34 }
35+size_t fread_unlocked(void *ptr, size_t size, size_t nmemb, FILE *f)
36+ __alias("fread");
37diff --git a/usr/klibc/fwrite2.c b/usr/klibc/fwrite2.c
38index cebc017c..3e0bb57d 100644
39--- a/usr/klibc/fwrite2.c
40+++ b/usr/klibc/fwrite2.c
41@@ -11,3 +11,5 @@ size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE * f)
42 {
43 return _fwrite(ptr, size * nmemb, f) / size;
44 }
45+size_t fwrite_unlocked(void *ptr, size_t size, size_t nmemb, FILE *f)
46+ __alias("fwrite");
47--
482.19.2
49
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 @@
1From 4b4147b76518d31a88fb2c58cdbf2236e159a25c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 8 Sep 2017 23:10:54 -0700
4Subject: [PATCH] Kbuild.klibc: Add path to compiler headers via -isystem
5
6We need to include this path so it can find compiler headers e.g.
7stdarg.h which is called from wrapper stdarg.h using include_next
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11---
12 scripts/Kbuild.klibc | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc
16index 101f86f..1d5cdc4 100644
17--- a/scripts/Kbuild.klibc
18+++ b/scripts/Kbuild.klibc
19@@ -105,7 +105,8 @@ KLIBCOBJCOPY := $(OBJCOPY)
20 KLIBCOBJDUMP := $(OBJDUMP)
21
22 # klibc include paths
23-KLIBCCPPFLAGS := -nostdinc -iwithprefix include \
24+KLIBCCPPFLAGS := -nostdinc -iwithprefix include \
25+ -isystem $(shell $(CC) -print-file-name=include) \
26 -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \
27 -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \
28 -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 @@
1From b6185401fc3daa7fa8ba2b84db3e4da3b94a9867 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 26 Jul 2017 16:13:16 -0700
4Subject: [PATCH] Kbuild.klibc: Use -print-libgcc-file-name instead of
5 --print-libgcc
6
7-print-libgcc-file-name works with clang and gcc unlike --print-libgcc
8which is gcc specific
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12---
13 scripts/Kbuild.klibc | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc
17index f500d53..101f86f 100644
18--- a/scripts/Kbuild.klibc
19+++ b/scripts/Kbuild.klibc
20@@ -128,7 +128,7 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS) \
21 KLIBCAFLAGS += -D__ASSEMBLY__ $(KLIBCCFLAGS)
22 KLIBCSTRIPFLAGS += --strip-all -R .comment -R .note
23
24-KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc)
25+KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) -print-libgcc-file-name)
26 KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF)
27 KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o
28 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 @@
1From 63ab5102d6ef362a597941e62470bf19e6f1652b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 11 Jul 2017 08:09:52 -0700
4Subject: [PATCH] always use bfd linker
5
6its possible that distros choose to default to gold linker
7therefore explicitly asking for bfd linker would fix the
8linking issues on such distros
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12---
13 Makefile | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/Makefile b/Makefile
17index dc10fc5..40647be 100644
18--- a/Makefile
19+++ b/Makefile
20@@ -20,7 +20,7 @@ include $(srctree)/scripts/Kbuild.include
21 KLIBCROSS ?= $(CROSS_COMPILE)
22 export KLIBCROSS
23 export CC := $(KLIBCROSS)gcc
24-export LD := $(KLIBCROSS)ld
25+export LD := $(KLIBCROSS)ld.bfd
26 export AR := $(KLIBCROSS)ar
27 export RANLIB := $(KLIBCROSS)ranlib
28 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 @@
1From ebd2b0e414c98467156b961abb470b5d07f37ea8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Sep 2017 23:11:53 -0700
4Subject: [PATCH] arm: Do not set a fallback march and mtune
5
6In OE we pass the options explicitly, there is
7no need to set it inside the makefiles, we will
8need to compute values for CPU_ARCH and CPU_TUNE
9which is a bit harder in OE
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13---
14 usr/klibc/arch/arm/MCONFIG | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG
18index 303c6ac..48d2685 100644
19--- a/usr/klibc/arch/arm/MCONFIG
20+++ b/usr/klibc/arch/arm/MCONFIG
21@@ -10,7 +10,7 @@
22 CPU_ARCH ?= armv4
23 CPU_TUNE ?= strongarm
24
25-KLIBCOPTFLAGS += -Os -march=$(CPU_ARCH) -mtune=$(CPU_TUNE)
26+KLIBCOPTFLAGS += -Os
27 KLIBCBITSIZE = 32
28 KLIBCREQFLAGS += -fno-exceptions
29 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 @@
1From 8beffe501c1ac5b35d62004735c4157c74183901 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 9 Jul 2017 13:51:25 -0700
4Subject: [PATCH] dash: Specify format string in fmtstr()
5
6Fixes build with hardening flags
7
8usr/dash/jobs.c:429:3: error: format not a string literal and no format arguments [-Werror=format-security]
9 col = fmtstr(s, 32, strsignal(st));
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13---
14 usr/dash/jobs.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/usr/dash/jobs.c b/usr/dash/jobs.c
18index 009bbfe..299bcac 100644
19--- a/usr/dash/jobs.c
20+++ b/usr/dash/jobs.c
21@@ -426,7 +426,7 @@ sprint_status(char *s, int status, int sigonly)
22 goto out;
23 #endif
24 }
25- col = fmtstr(s, 32, strsignal(st));
26+ col = fmtstr(s, 32, "%s", strsignal(st));
27 #ifdef WCOREDUMP
28 if (WCOREDUMP(status)) {
29 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 @@
1From d966d52d1e569cbc2293d841285e2b8941f28c61 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 9 Jul 2017 15:56:28 -0700
4Subject: [PATCH] include linux/sysinfo.h directly
5
6This is done to avoid the kernel header linux/kernel.h to use
7__GLIBC__ define to decide on if libc implements sysinfo() API
8or not. Kernel headers should be independent of such assumptions
9but until its done in right place, change the local header
10override to avoid this assumption
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14---
15 usr/include/sys/sysinfo.h | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/usr/include/sys/sysinfo.h b/usr/include/sys/sysinfo.h
19index dba68dc..d145c0b 100644
20--- a/usr/include/sys/sysinfo.h
21+++ b/usr/include/sys/sysinfo.h
22@@ -5,7 +5,7 @@
23 #ifndef _SYS_SYSINFO_H
24 #define _SYS_SYSINFO_H
25
26-#include <linux/kernel.h>
27+#include <linux/sysinfo.h>
28
29 extern int sysinfo(struct sysinfo *info);
30
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 @@
1From cdc6edc2cfcd0ce88d6e66654d605dad303b1a75 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 11 Sep 2018 17:03:36 -0700
4Subject: [PATCH] klibc/Kbuild: Accept EXTRA_KLIBCAFLAGS
5
6For passing additional assembler flags
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 usr/klibc/Kbuild | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild
16index 98caf2e9..b34521e0 100644
17--- a/usr/klibc/Kbuild
18+++ b/usr/klibc/Kbuild
19@@ -168,7 +168,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash
20 targets += interp.o
21
22 quiet_cmd_interp = BUILD $@
23- cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \
24+ cmd_interp = $(KLIBCCC) $(klibccflags) $(EXTRA_KLIBCAFLAGS) \
25+ -D__ASSEMBLY__ \
26 -DLIBDIR=\"$(SHLIBDIR)\" \
27 -DSOHASH=\"$(SOLIBHASH)\" \
28 -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 @@
1From e4d5d5224609d7d5c824dd231f5baec868befdfa Mon Sep 17 00:00:00 2001
2From: Andrea Adami <andrea.adami@gmail.com>
3Date: Tue, 4 Sep 2018 23:56:00 +0200
4Subject: [PATCH 1/1] klibc: add getrandom() syscall
5
6needed by latest kexec-tools for qemuarm64 (kashan)
7
8Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
9---
10 usr/klibc/SYSCALLS.def | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def
14index 6b3bf4c..d4184ba 100644
15--- a/usr/klibc/SYSCALLS.def
16+++ b/usr/klibc/SYSCALLS.def
17@@ -274,6 +274,7 @@ int syslog::klogctl(int, char *, int);
18 int sysinfo(struct sysinfo *);
19 long kexec_load(void *, unsigned long, struct kexec_segment *, unsigned long);
20 <x86_64,ppc64,s390x> long kexec_file_load(int, int, unsigned long, const char *, unsigned long);
21+ssize_t getrandom(void *, size_t, unsigned int);
22
23 /*
24 * Low-level I/O (generally architecture-specific);
25--
262.7.4
27
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 @@
1From c034dceae17b7d8d437871afe5eba55a55434222 Mon Sep 17 00:00:00 2001
2From: Andrea Adami <andrea.adami@gmail.com>
3Date: Wed, 10 Oct 2018 00:48:31 +0200
4Subject: [PATCH] klibc-static-utils: do not build shared binaries
5
6We were building some shared utilities and this was leading to linker errors
7for x86 with security flags enabled.
8
9Fix
10 i586-oe-linux-musl-ld.bfd: discarded output section: `.got.plt'
11
12Upstream-Status: Inappropriate [Embedded Specific]
13
14Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
15---
16 usr/dash/Kbuild | 6 +-----
17 usr/kinit/Kbuild | 4 +---
18 usr/kinit/fstype/Kbuild | 4 +---
19 usr/kinit/ipconfig/Kbuild | 4 +---
20 usr/kinit/nfsmount/Kbuild | 4 +---
21 usr/kinit/resume/Kbuild | 5 +----
22 usr/kinit/run-init/Kbuild | 5 +----
23 usr/utils/Kbuild | 7 ++-----
24 8 files changed, 9 insertions(+), 30 deletions(-)
25
26diff --git a/usr/dash/Kbuild b/usr/dash/Kbuild
27index 1a6920a..b3a4e64 100644
28--- a/usr/dash/Kbuild
29+++ b/usr/dash/Kbuild
30@@ -25,12 +25,8 @@ gen-h-files := builtins.h nodes.h syntax.h token.h
31
32 static-y := sh
33
34-# The shared binary
35-shared-y := sh.shared
36-sh.shared-y := $(sh-y)
37-
38 # For cleaning
39-targets := sh sh.g sh.shared sh.shared.g $(gen-o-files)
40+targets := sh sh.g $(gen-o-files)
41
42 # explicit dependency for all generated files
43 $(addprefix $(obj)/, $(sh-y)): $(addprefix $(obj)/, $(gen-h-files))
44diff --git a/usr/kinit/Kbuild b/usr/kinit/Kbuild
45index f7fdccd..8db06ab 100644
46--- a/usr/kinit/Kbuild
47+++ b/usr/kinit/Kbuild
48@@ -18,8 +18,6 @@ kinit-y += fstype/
49 kinit-y += resume/
50
51 static-y := kinit
52-shared-y := kinit.shared
53-kinit.shared-y := $(kinit-y)
54
55 # Additional include paths files
56 KLIBCCFLAGS += -I$(srctree)/$(src)/fstype \
57@@ -29,7 +27,7 @@ KLIBCCFLAGS += -I$(srctree)/$(src)/fstype \
58 -I$(srctree)/$(src)/run-init
59
60 # Cleaning
61-targets += kinit kinit.g kinit.shared kinit.shared.g
62+targets += kinit kinit.g
63 subdir- := fstype ipconfig nfsmount resume run-init
64
65
66diff --git a/usr/kinit/fstype/Kbuild b/usr/kinit/fstype/Kbuild
67index 367611d..8d453ea 100644
68--- a/usr/kinit/fstype/Kbuild
69+++ b/usr/kinit/fstype/Kbuild
70@@ -3,7 +3,6 @@
71 #
72
73 static-y := static/fstype
74-shared-y := shared/fstype
75
76 # common .o files
77 objs := main.o fstype.o
78@@ -16,8 +15,7 @@ lib-y := $(objs)
79
80 # .o files used to built executables
81 static/fstype-y := $(objs)
82-shared/fstype-y := $(objs)
83
84 # Cleaning
85-clean-dirs := static shared
86+clean-dirs := static
87
88diff --git a/usr/kinit/ipconfig/Kbuild b/usr/kinit/ipconfig/Kbuild
89index eb1d472..ef87e7e 100644
90--- a/usr/kinit/ipconfig/Kbuild
91+++ b/usr/kinit/ipconfig/Kbuild
92@@ -3,7 +3,6 @@
93 #
94
95 static-y := static/ipconfig
96-shared-y := shared/ipconfig
97
98 # common .o files
99 objs := main.o netdev.o packet.o
100@@ -22,8 +21,7 @@ lib-y := $(objs)
101
102 # .o files used to built executables
103 static/ipconfig-y := $(objs)
104-shared/ipconfig-y := $(objs)
105
106 # Cleaning
107-clean-dirs := static shared
108+clean-dirs := static
109
110diff --git a/usr/kinit/nfsmount/Kbuild b/usr/kinit/nfsmount/Kbuild
111index ba31708..01bedce 100644
112--- a/usr/kinit/nfsmount/Kbuild
113+++ b/usr/kinit/nfsmount/Kbuild
114@@ -4,7 +4,6 @@
115
116 static-y := static/nfsmount
117 #FIXME - build is broken static-y := dummypmap
118-shared-y := shared/nfsmount
119
120 objs := main.o mount.o portmap.o dummypmap.o sunrpc.o
121
122@@ -13,7 +12,6 @@ lib-y := $(objs)
123
124 # .o files used for executables
125 static/nfsmount-y := $(objs)
126-shared/nfsmount-y := $(objs)
127
128 # dummypmap uses a single .o file (rename src file?)
129 dummypmap-y := dummypmap_test.o
130@@ -21,5 +19,5 @@ dummypmap-y := dummypmap_test.o
131 # TODO - do we want a stripped version
132 # TODO - do we want the static.g + shared.g directories?
133
134-clean-dirs := static shared
135+clean-dirs := static
136
137diff --git a/usr/kinit/resume/Kbuild b/usr/kinit/resume/Kbuild
138index c1342e1..15b9590 100644
139--- a/usr/kinit/resume/Kbuild
140+++ b/usr/kinit/resume/Kbuild
141@@ -3,7 +3,6 @@
142 #
143
144 static-y := static/resume
145-shared-y := shared/resume
146
147 # common .o files
148 objs := resume.o resumelib.o
149@@ -20,9 +19,7 @@ KLIBCCFLAGS += -I$(srctree)/$(src)/..
150 # .o files used to built executables
151 static/resume-y := $(objs)
152 static/resume-lib := ../lib.a
153-shared/resume-y := $(objs)
154-shared/resume-lib := ../lib.a
155
156 # Cleaning
157-clean-dirs := static shared
158+clean-dirs := static
159
160diff --git a/usr/kinit/run-init/Kbuild b/usr/kinit/run-init/Kbuild
161index c153b0a..a1ea834 100644
162--- a/usr/kinit/run-init/Kbuild
163+++ b/usr/kinit/run-init/Kbuild
164@@ -3,7 +3,6 @@
165 #
166
167 static-y := static/run-init
168-shared-y := shared/run-init
169
170 # common .o files
171 objs := run-init.o runinitlib.o
172@@ -24,9 +23,7 @@ KLIBCCFLAGS += -I$(srctree)/$(src)/..
173 # .o files used to built executables
174 static/run-init-y := $(objs)
175 static/run-init-lib := ../lib.a
176-shared/run-init-y := $(objs)
177-shared/run-init-lib := ../lib.a
178
179 # Cleaning
180-clean-dirs := static shared
181+clean-dirs := static
182
183diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild
184index 67d9486..1573363 100644
185--- a/usr/utils/Kbuild
186+++ b/usr/utils/Kbuild
187@@ -7,7 +7,6 @@ progs += true false sleep ln mv nuke minips cat ls losetup
188 progs += uname halt kill readlink cpio sync dmesg
189
190 static-y := $(addprefix static/, $(progs))
191-shared-y := $(addprefix shared/, $(progs))
192
193 # The binary is placed in a subdir, so we need to tell kbuild this
194 static/chroot-y := chroot.o
195@@ -62,13 +61,11 @@ static/losetup-y := losetup.o
196 shared/losetup-y := losetup.o
197
198 # Additionally linked targets
199-always := static/reboot static/poweroff shared/reboot shared/poweroff
200+always := static/reboot static/poweroff
201
202 $(obj)/static/reboot $(obj)/static/poweroff: $(obj)/static/halt
203 $(call cmd,ln)
204-$(obj)/shared/reboot $(obj)/shared/poweroff: $(obj)/shared/halt
205- $(call cmd,ln)
206
207 # Clean deletes the static and shared dir
208-clean-dirs := static shared
209+clean-dirs := static
210
211--
2122.7.4
213
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 @@
1From 90683d5eaabfa684a71411d6e3262153ac191ad8 Mon Sep 17 00:00:00 2001
2From: Andrea Adami <andrea.adami@gmail.com>
3Date: Tue, 4 Sep 2018 23:44:30 +0200
4Subject: [PATCH 1/1] klibc_2.0.4: add kexec_file_load syscall
5
6for supported archs only (matched in kexec-tools)
7
8Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
9---
10 usr/klibc/SYSCALLS.def | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def
14index c56e8f9..6b3bf4c 100644
15--- a/usr/klibc/SYSCALLS.def
16+++ b/usr/klibc/SYSCALLS.def
17@@ -273,6 +273,7 @@ int reboot::__reboot(int, int, int, void *);
18 int syslog::klogctl(int, char *, int);
19 int sysinfo(struct sysinfo *);
20 long kexec_load(void *, unsigned long, struct kexec_segment *, unsigned long);
21+<x86_64,ppc64,s390x> long kexec_file_load(int, int, unsigned long, const char *, unsigned long);
22
23 /*
24 * Low-level I/O (generally architecture-specific);
25--
262.7.4
27
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 @@
1From cf97079009ba48d10e52052b2eab7461ea4dd09b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 10 Jul 2017 20:42:50 -0700
4Subject: [PATCH] mkfifo: Implement mkfifo
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8---
9 usr/utils/mkfifo.c | 5 +++++
10 1 file changed, 5 insertions(+)
11
12diff --git a/usr/utils/mkfifo.c b/usr/utils/mkfifo.c
13index 5a758b2..f1f577e 100644
14--- a/usr/utils/mkfifo.c
15+++ b/usr/utils/mkfifo.c
16@@ -26,6 +26,11 @@ static int make_fifo(char *dir)
17 return 0;
18 }
19
20+int mkfifo (const char *__p, mode_t __m)
21+{
22+ return mknod(__p, (__m & ~S_IFMT) | S_IFIFO, (dev_t) 0);
23+}
24+
25 int main(int argc, char *argv[])
26 {
27 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 @@
1From d2fb484d995221277cce7abddcd7dfa0e8bceec3 Mon Sep 17 00:00:00 2001
2From: Andrea Adami <andrea.adami@gmail.com>
3Date: Fri, 11 Jan 2013 17:26:40 +0000
4Subject: [PATCH] klibc_2.0.2: apply FIX_V4BX patch for armv4 targets only
5
6Status: not applicable upstream, in OE/Yocto we use $(FIX_V4BX)
7which is "" in case of armv5 or thumbs.
8
9Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
10
11---
12 usr/klibc/arch/arm/MCONFIG | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG
16index 53bc1dc..303c6ac 100644
17--- a/usr/klibc/arch/arm/MCONFIG
18+++ b/usr/klibc/arch/arm/MCONFIG
19@@ -29,6 +29,7 @@ else
20 KLIBCSHAREDFLAGS = -Ttext 0x01800200
21 ifeq ($(CONFIG_AEABI),y)
22 KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork
23+KLIBCLDFLAGS += $(FIX_ARMV4_EABI_BX)
24 else
25 KLIBCREQFLAGS += -mabi=apcs-gnu -mno-thumb-interwork
26 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 @@
1From 0cb26cf2d25d36c1fdcc4f1635e4329436ed866a Mon Sep 17 00:00:00 2001
2From: Andrea Adami <andrea.adami@gmail.com>
3Date: Fri, 19 Sep 2014 23:09:29 +0200
4
5---
6 klcc/klcc.in | 3 +++
7 1 file changed, 3 insertions(+)
8
9diff --git a/klcc/klcc.in b/klcc/klcc.in
10index 43d0984..61e9385 100644
11--- a/klcc/klcc.in
12+++ b/klcc/klcc.in
13@@ -204,6 +204,9 @@ while ( defined($a = shift(@ARGV)) ) {
14 # Libraries
15 push(@libs, $a);
16 push(@libs, shift(@ARGV)) if ( $2 eq '' );
17+ } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) {
18+ # Override gcc encoded sysroot
19+ push(@ccopt, $a);
20 } else {
21 die "$0: unknown option: $a\n";
22 }
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 @@
1meta-clang passes this option to compiler defaults
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Index: git/klcc/klcc.in
7===================================================================
8--- git.orig/klcc/klcc.in
9+++ git/klcc/klcc.in
10@@ -207,6 +207,9 @@ while ( defined($a = shift(@ARGV)) ) {
11 } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) {
12 # Override gcc encoded sysroot
13 push(@ccopt, $a);
14+ } elsif ( $a eq '-no-integrated-as' ) {
15+ # Allow clang options
16+ push(@ccopt, $a);
17 } else {
18 die "$0: unknown option: $a\n";
19 }
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 @@
1From 1118cc971917abe19ddb029aa80417f6fd6bb343 Mon Sep 17 00:00:00 2001
2From: Thomas Kunze <thommycheck@gmx.de>
3Date: Sat, 6 Aug 2011 05:30:14 +0000
4Subject: [PATCH] klibc: initial commit of version 1.5.24
5
6Patch was imported from the OpenEmbedded git server
7(git://git.openembedded.org/openembedded)
8as of commit id b6764cf32ec93547531130dca364fb95e1c495f4
9Signed-off-by: Thomas Kunze <thommycheck@gmx.de>
10
11---
12 defconfig | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/defconfig b/defconfig
16index 04b98e9..0cb23d0 100644
17--- a/defconfig
18+++ b/defconfig
19@@ -6,4 +6,4 @@ CONFIG_KLIBC_ZLIB=y
20 CONFIG_REGPARM=y
21 # ARM options
22 # CONFIG_KLIBC_THUMB is not set
23-# CONFIG_AEABI is not set
24+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 @@
1From 1be2bc41f915922102a3ba671b54c2df6f0052e6 Mon Sep 17 00:00:00 2001
2From: Ben Hutchings <ben@decadent.org.uk>
3Date: Sun, 14 Mar 2010 18:41:56 +0000
4Subject: [PATCH] klibc_1.5.26: now build against linux-libc-headers
5
6commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a
7
8 Taken from debian "Fix klibc Debian specific build trouble"
9 Adapted for klibc_2.0.2
10
11---
12 scripts/Kbuild.install | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install
16index 8af5697..d32a8a5 100644
17--- a/scripts/Kbuild.install
18+++ b/scripts/Kbuild.install
19@@ -95,7 +95,9 @@ header:
20 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
21 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
22 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
23- $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
24+ $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \
25+ ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
26+ done
27 $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
28 $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
29 $(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 @@
1From 1892079b827cf8f8316305b6d6e0985db82441a2 Mon Sep 17 00:00:00 2001
2From: Thomas Kunze <thommycheck@gmx.de>
3Date: Sat, 6 Aug 2011 05:30:14 +0000
4Subject: [PATCH] klibc: initial commit of version 1.5.24
5
6Patch was imported from the OpenEmbedded git server
7(git://git.openembedded.org/openembedded)
8as of commit id eefb99a313bbcc8f34c8b32bf0c5aa2dd2580735
9Signed-off-by: Thomas Kunze <thommycheck@gmx.de>
10
11Minor edits following upstream changes
12Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
13
14---
15 scripts/Kbuild.install | 4 ----
16 usr/dash/Kbuild | 2 --
17 usr/gzip/Kbuild | 2 --
18 usr/kinit/Kbuild | 2 --
19 usr/kinit/fstype/Kbuild | 2 --
20 usr/kinit/ipconfig/Kbuild | 2 --
21 usr/kinit/nfsmount/Kbuild | 2 --
22 usr/kinit/resume/Kbuild | 2 --
23 usr/kinit/run-init/Kbuild | 2 --
24 usr/klibc/Kbuild | 2 --
25 usr/utils/Kbuild | 2 --
26 11 files changed, 24 deletions(-)
27
28diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install
29index d32a8a5..fda699d 100644
30--- a/scripts/Kbuild.install
31+++ b/scripts/Kbuild.install
32@@ -88,19 +88,15 @@ else
33 header:
34 $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
35 $(Q)mkdir -p $(INSTALLROOT)$(bindir)
36- $(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1
37- $(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR)
38 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)
39 $(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
40 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
41 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
42- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
43 $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \
44 ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
45 done
46 $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
47 $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
48- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
49 $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
50
51 footer: header
52diff --git a/usr/dash/Kbuild b/usr/dash/Kbuild
53index 3a98c1f..1a6920a 100644
54--- a/usr/dash/Kbuild
55+++ b/usr/dash/Kbuild
56@@ -92,5 +92,3 @@ $(obj)/syntax.c: $(obj)/mksyntax
57 $(obj)/syntax.h: $(obj)/syntax.c
58 $(Q):
59
60-# Targets to install
61-install-y := sh.shared
62diff --git a/usr/gzip/Kbuild b/usr/gzip/Kbuild
63index 9bbf0a4..c497d02 100644
64--- a/usr/gzip/Kbuild
65+++ b/usr/gzip/Kbuild
66@@ -21,5 +21,3 @@ $(obj)/gunzip $(obj)/zcat: $(obj)/gzip
67 # Cleaning
68 targets := gzip gzip.g gunzip zcat
69
70-# Targets to install
71-install-y := gzip gunzip zcat
72diff --git a/usr/kinit/Kbuild b/usr/kinit/Kbuild
73index 5320127..f7fdccd 100644
74--- a/usr/kinit/Kbuild
75+++ b/usr/kinit/Kbuild
76@@ -33,5 +33,3 @@ targets += kinit kinit.g kinit.shared kinit.shared.g
77 subdir- := fstype ipconfig nfsmount resume run-init
78
79
80-# install binary
81-install-y := kinit kinit.shared
82diff --git a/usr/kinit/fstype/Kbuild b/usr/kinit/fstype/Kbuild
83index 9b20db1..367611d 100644
84--- a/usr/kinit/fstype/Kbuild
85+++ b/usr/kinit/fstype/Kbuild
86@@ -21,5 +21,3 @@ shared/fstype-y := $(objs)
87 # Cleaning
88 clean-dirs := static shared
89
90-# install binary
91-install-y := $(shared-y)
92diff --git a/usr/kinit/ipconfig/Kbuild b/usr/kinit/ipconfig/Kbuild
93index 7f8d181..eb1d472 100644
94--- a/usr/kinit/ipconfig/Kbuild
95+++ b/usr/kinit/ipconfig/Kbuild
96@@ -27,5 +27,3 @@ shared/ipconfig-y := $(objs)
97 # Cleaning
98 clean-dirs := static shared
99
100-# install binary
101-install-y := $(shared-y)
102diff --git a/usr/kinit/nfsmount/Kbuild b/usr/kinit/nfsmount/Kbuild
103index 461e6f3..ba31708 100644
104--- a/usr/kinit/nfsmount/Kbuild
105+++ b/usr/kinit/nfsmount/Kbuild
106@@ -23,5 +23,3 @@ dummypmap-y := dummypmap_test.o
107
108 clean-dirs := static shared
109
110-# Install binary
111-install-y := $(shared-y)
112diff --git a/usr/kinit/resume/Kbuild b/usr/kinit/resume/Kbuild
113index 034195d..c1342e1 100644
114--- a/usr/kinit/resume/Kbuild
115+++ b/usr/kinit/resume/Kbuild
116@@ -26,5 +26,3 @@ shared/resume-lib := ../lib.a
117 # Cleaning
118 clean-dirs := static shared
119
120-# install binary
121-install-y := $(shared-y)
122diff --git a/usr/kinit/run-init/Kbuild b/usr/kinit/run-init/Kbuild
123index f7832b7..c153b0a 100644
124--- a/usr/kinit/run-init/Kbuild
125+++ b/usr/kinit/run-init/Kbuild
126@@ -30,5 +30,3 @@ shared/run-init-lib := ../lib.a
127 # Cleaning
128 clean-dirs := static shared
129
130-# install binary
131-install-y := $(shared-y)
132diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild
133index eba6add..98caf2e 100644
134--- a/usr/klibc/Kbuild
135+++ b/usr/klibc/Kbuild
136@@ -185,5 +185,3 @@ install-rule:
137 $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib))
138 $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
139 $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib
140- $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
141- $(INSTALLROOT)$(SHLIBDIR)
142diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild
143index 05aa794..67d9486 100644
144--- a/usr/utils/Kbuild
145+++ b/usr/utils/Kbuild
146@@ -72,5 +72,3 @@ $(obj)/shared/reboot $(obj)/shared/poweroff: $(obj)/shared/halt
147 # Clean deletes the static and shared dir
148 clean-dirs := static shared
149
150-# install only install the shared binaries
151-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 @@
1Patch was imported from the OpenEmbedded git server
2(git://git.openembedded.org/openembedded)
3as of commit id 676cbb54d42c89a4832871064cfcb7ee2ad372ee
4
5klcc-cross: Add patch to use /usr/bin/env perl
6Certain configurations (such as autobuilders) may build in very
7deep paths (that are longer than the #! mechanism allows) which
8makes it unsafe to use the direct path for perl. In our case we know
9that /usr/bin/env perl will always return ours (if it has been built).
10
11Signed-off-by: Tom Rini <tom_rini@mentor.com>
12
13Index: klibc-1.5.20/klcc/makeklcc.pl
14===================================================================
15--- a/klcc/makeklcc.pl
16+++ b/klcc/makeklcc.pl
17@@ -26,7 +26,7 @@ sub pathsearch($) {
18 return undef;
19 }
20
21-print "#!${perlpath}\n";
22+print "#!/usr/bin/env perl\n";
23
24 open(KLIBCCONF, "< $klibcconf\0")
25 or die "$0: cannot open $klibcconf: $!\n";
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-08-03 15:26:27 +0000