diff options
4 files changed, 0 insertions, 154 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch deleted file mode 100644 index da2e117a48..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | From 7dddfb8fec5317ea16154d30e8e18b6559979b60 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 3 | Date: Sun, 25 Aug 2013 22:51:07 -0400 | ||
| 4 | Subject: [PATCH] ptrace.h: remove ptrace_peeksiginfo_args | ||
| 5 | |||
| 6 | The addition of ptrace_peeksiginfo_args to the uapi in kernel commit | ||
| 7 | 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)] | ||
| 8 | means that existing applications using glibc versions that define ptrace_peeksiginfo_args | ||
| 9 | in sys/ptrace.h will get duplicate structure definitions like: | ||
| 10 | |||
| 11 | | In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0: | ||
| 12 | | /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args' | ||
| 13 | | struct ptrace_peeksiginfo_args { | ||
| 14 | | ^ | ||
| 15 | | In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0, | ||
| 16 | | from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37: | ||
| 17 | | /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here | ||
| 18 | | struct ptrace_peeksiginfo_args | ||
| 19 | | ^ | ||
| 20 | | make[2]: *** [process.o] Error 1 | ||
| 21 | |||
| 22 | Reverting to the previous status of not exporting this structure temporarily | ||
| 23 | fixes applications, until they can be adjusted to not mix sys/ptrace.h and | ||
| 24 | linux/ptrace.h includes. | ||
| 25 | |||
| 26 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 27 | --- | ||
| 28 | include/uapi/linux/ptrace.h | 6 ------ | ||
| 29 | 1 file changed, 6 deletions(-) | ||
| 30 | |||
| 31 | diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h | ||
| 32 | index 52ebcc8..524599d 100644 | ||
| 33 | --- a/include/uapi/linux/ptrace.h | ||
| 34 | +++ b/include/uapi/linux/ptrace.h | ||
| 35 | @@ -55,12 +55,6 @@ | ||
| 36 | |||
| 37 | #define PTRACE_PEEKSIGINFO 0x4209 | ||
| 38 | |||
| 39 | -struct ptrace_peeksiginfo_args { | ||
| 40 | - __u64 off; /* from which siginfo to start */ | ||
| 41 | - __u32 flags; | ||
| 42 | - __s32 nr; /* how may siginfos to take */ | ||
| 43 | -}; | ||
| 44 | - | ||
| 45 | /* Read signals from a shared (process wide) queue */ | ||
| 46 | #define PTRACE_PEEKSIGINFO_SHARED (1 << 0) | ||
| 47 | |||
| 48 | -- | ||
| 49 | 1.7.10.4 | ||
| 50 | |||
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/UAPI-include-asm-byteorder.h-in-linux-raid-md_p.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/UAPI-include-asm-byteorder.h-in-linux-raid-md_p.h.patch deleted file mode 100644 index 1bf0e7ec85..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/UAPI-include-asm-byteorder.h-in-linux-raid-md_p.h.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From c0f8bd146a8b3e630798561c605f5669823107af Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Aurelien Jarno <aurelien@aurel32.net> | ||
| 3 | Date: Thu, 14 Nov 2013 15:16:19 +1100 | ||
| 4 | Subject: [PATCH] UAPI: include <asm/byteorder.h> in linux/raid/md_p.h | ||
| 5 | |||
| 6 | linux/raid/md_p.h is using conditionals depending on endianess and fails | ||
| 7 | with an error if neither of __BIG_ENDIAN, __LITTLE_ENDIAN or | ||
| 8 | __BYTE_ORDER are defined, but it doesn't include any header which can | ||
| 9 | define these constants. This make this header unusable alone. | ||
| 10 | |||
| 11 | This patch adds a #include <asm/byteorder.h> at the beginning of this | ||
| 12 | header to make it usable alone. This is needed to compile klibc on MIPS. | ||
| 13 | |||
| 14 | Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> | ||
| 15 | Signed-off-by: NeilBrown <neilb@suse.de> | ||
| 16 | --- | ||
| 17 | include/uapi/linux/raid/md_p.h | 1 + | ||
| 18 | 1 file changed, 1 insertion(+) | ||
| 19 | |||
| 20 | diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h | ||
| 21 | index fe1a540..f7cf7f3 100644 | ||
| 22 | --- a/include/uapi/linux/raid/md_p.h | ||
| 23 | +++ b/include/uapi/linux/raid/md_p.h | ||
| 24 | @@ -16,6 +16,7 @@ | ||
| 25 | #define _MD_P_H | ||
| 26 | |||
| 27 | #include <linux/types.h> | ||
| 28 | +#include <asm/byteorder.h> | ||
| 29 | |||
| 30 | /* | ||
| 31 | * RAID superblock. | ||
| 32 | -- | ||
| 33 | 1.8.1.2 | ||
| 34 | |||
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/scripts-Makefile.headersinst-install-headers-from-sc.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/scripts-Makefile.headersinst-install-headers-from-sc.patch deleted file mode 100644 index 7eb7defcde..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/scripts-Makefile.headersinst-install-headers-from-sc.patch +++ /dev/null | |||
| @@ -1,59 +0,0 @@ | |||
| 1 | From b200d4bcffc86bb08fd3898bc7cde00f0686f62d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
| 3 | Date: Fri, 13 Sep 2013 22:01:02 -0400 | ||
| 4 | Subject: [PATCH] scripts/Makefile.headersinst: install headers from scratch file | ||
| 5 | |||
| 6 | If headers_install is executed from a deep/long directory structure, the | ||
| 7 | shell's maximum argument length can be execeeded, which breaks the operation | ||
| 8 | with: | ||
| 9 | |||
| 10 | | make[2]: execvp: /bin/sh: Argument list too long | ||
| 11 | | make[2]: *** | ||
| 12 | |||
| 13 | By dumping the input files to a scratch file and using xargs to read the | ||
| 14 | input list from the scratch file, we can avoid blowing out the maximum | ||
| 15 | argument size and install headers in a long path name environment. | ||
| 16 | |||
| 17 | Robert: | ||
| 18 | Use "$(foreach ,,$(shell echo))" rather than "echo" to make it work when | ||
| 19 | len(TMPDIR) <= 410. | ||
| 20 | |||
| 21 | Upstream-Status: Inappropriate [oe-specific] | ||
| 22 | |||
| 23 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 24 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 25 | --- | ||
| 26 | RP: Refreshed for 3.10 as the problem still exists there on the autobuilders | ||
| 27 | scripts/Makefile.headersinst | 9 ++++++++- | ||
| 28 | 1 file changed, 8 insertions(+), 1 deletion(-) | ||
| 29 | |||
| 30 | diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst | ||
| 31 | --- a/scripts/Makefile.headersinst | ||
| 32 | +++ b/scripts/Makefile.headersinst | ||
| 33 | @@ -72,7 +72,7 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) | ||
| 34 | quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ | ||
| 35 | file$(if $(word 2, $(all-files)),s)) | ||
| 36 | cmd_install = \ | ||
| 37 | - $(CONFIG_SHELL) $< $(installdir) $(input-files); \ | ||
| 38 | + xargs $(CONFIG_SHELL) $< $(installdir) < $(INSTALL_HDR_PATH)/.input-files; \ | ||
| 39 | for F in $(wrapper-files); do \ | ||
| 40 | echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ | ||
| 41 | done; \ | ||
| 42 | @@ -98,10 +98,17 @@ __headersinst: $(subdirs) $(install-file) | ||
| 43 | @: | ||
| 44 | |||
| 45 | targets += $(install-file) | ||
| 46 | +# Use the $(foreach ,,$(shell echo)) to avoid the "Argument list too | ||
| 47 | +# long" error, and use the "$(shell echo)" rather than "echo" to keep | ||
| 48 | +# the order. | ||
| 49 | $(install-file): scripts/headers_install.sh $(input-files) FORCE | ||
| 50 | $(if $(unwanted),$(call cmd,remove),) | ||
| 51 | $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) | ||
| 52 | + $(shell echo -n > $(INSTALL_HDR_PATH)/.input-files) | ||
| 53 | + $(foreach f,$(input-files),$(shell echo -n "$(f) " >> \ | ||
| 54 | + $(INSTALL_HDR_PATH)/.input-files)) | ||
| 55 | $(call if_changed,install) | ||
| 56 | + @rm $(INSTALL_HDR_PATH)/.input-files | ||
| 57 | |||
| 58 | else | ||
| 59 | __headerscheck: $(subdirs) $(check-file) | ||
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb deleted file mode 100644 index a78d4ba59a..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | require linux-libc-headers.inc | ||
| 2 | |||
| 3 | SRC_URI += "file://0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch" | ||
| 4 | SRC_URI += "file://scripts-Makefile.headersinst-install-headers-from-sc.patch" | ||
| 5 | |||
| 6 | # fixes klibc build for MIPS, drop when libc-headers > 3.13 | ||
| 7 | SRC_URI += "file://UAPI-include-asm-byteorder.h-in-linux-raid-md_p.h.patch" | ||
| 8 | |||
| 9 | SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944" | ||
| 10 | SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8" | ||
| 11 | |||
