summaryrefslogtreecommitdiff
path: root/toolchain/kernel-headers
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-24 17:12:26 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-24 17:12:26 +0200
commitd5bcfc9feb6a785ee9bf068cf001cb34f9b133c3 (patch)
treedc799ede8f15fc9a6e313efd78cdd30019d6e367 /toolchain/kernel-headers
parent94c82fcf15415a015b602a58a26880bb0ad97da4 (diff)
update 3.10 kernel
Diffstat (limited to 'toolchain/kernel-headers')
-rw-r--r--toolchain/kernel-headers/patches/3.10.36/headers-install.patch91
-rw-r--r--toolchain/kernel-headers/patches/3.10.37/headers-install.patch11
-rw-r--r--toolchain/kernel-headers/patches/3.10.37/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.37/relocs.patch (renamed from toolchain/kernel-headers/patches/3.10.36/relocs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.37/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.10.36/sgidefs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.37/sortext.patch (renamed from toolchain/kernel-headers/patches/3.10.36/sortext.patch)0
6 files changed, 11 insertions, 91 deletions
diff --git a/toolchain/kernel-headers/patches/3.10.36/headers-install.patch b/toolchain/kernel-headers/patches/3.10.36/headers-install.patch
deleted file mode 100644
index de37bdafb..000000000
--- a/toolchain/kernel-headers/patches/3.10.36/headers-install.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -Nur linux-3.10.36.orig/scripts/headers_install.sh linux-3.10.36/scripts/headers_install.sh
---- linux-3.10.36.orig/scripts/headers_install.sh 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/scripts/headers_install.sh 2014-04-14 20:32:34.000000000 +0200
-@@ -2,7 +2,7 @@
-
- if [ $# -lt 1 ]
- then
-- echo "Usage: headers_install.sh OUTDIR [FILES...]
-+ echo "Usage: headers_install.sh OUTDIR SRCDIR [FILES...]
- echo
- echo "Prepares kernel header files for use by user space, by removing"
- echo "all compiler.h definitions and #includes, removing any"
-@@ -10,6 +10,7 @@
- echo "asm/inline/volatile keywords."
- echo
- echo "OUTDIR: directory to write each userspace header FILE to."
-+ echo "SRCDIR: source directory where files are picked."
- echo "FILES: list of header files to operate on."
-
- exit 1
-@@ -19,6 +20,8 @@
-
- OUTDIR="$1"
- shift
-+SRCDIR="$1"
-+shift
-
- # Iterate through files listed on command line
-
-@@ -34,7 +37,7 @@
- -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
- -e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
- -e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
-- "$i" > "$OUTDIR/$FILE.sed" || exit 1
-+ "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
- scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
- > "$OUTDIR/$FILE"
- [ $? -gt 1 ] && exit 1
-diff -Nur linux-3.10.36.orig/scripts/Makefile.headersinst linux-3.10.36/scripts/Makefile.headersinst
---- linux-3.10.36.orig/scripts/Makefile.headersinst 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/scripts/Makefile.headersinst 2014-04-14 20:42:47.000000000 +0200
-@@ -47,18 +47,24 @@
- all-files := $(header-y) $(genhdr-y) $(wrapper-files)
- output-files := $(addprefix $(installdir)/, $(all-files))
-
--input-files := $(foreach hdr, $(header-y), \
-+input-files1 := $(foreach hdr, $(header-y), \
- $(if $(wildcard $(srcdir)/$(hdr)), \
-- $(wildcard $(srcdir)/$(hdr)), \
-+ $(wildcard $(srcdir)/$(hdr))) \
-+ )
-+input-files1-name := $(notdir $(input-files1))
-+input-files2 := $(foreach hdr, $(header-y), \
-+ $(if $(wildcard $(srcdir)/$(hdr)),, \
- $(if $(wildcard $(oldsrcdir)/$(hdr)), \
- $(wildcard $(oldsrcdir)/$(hdr)), \
- $(error Missing UAPI file $(srcdir)/$(hdr))) \
-- )) \
-- $(foreach hdr, $(genhdr-y), \
-+ ))
-+input-files2-name := $(notdir $(input-files2))
-+input-files3 := $(foreach hdr, $(genhdr-y), \
- $(if $(wildcard $(gendir)/$(hdr)), \
- $(wildcard $(gendir)/$(hdr)), \
- $(error Missing generated UAPI file $(gendir)/$(hdr)) \
- ))
-+input-files3-name := $(notdir $(input-files3))
-
- # Work out what needs to be removed
- oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h))
-@@ -72,7 +78,9 @@
- quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
- file$(if $(word 2, $(all-files)),s))
- cmd_install = \
-- $(CONFIG_SHELL) $< $(installdir) $(input-files); \
-+ $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \
-+ $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \
-+ $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \
- for F in $(wrapper-files); do \
- echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \
- done; \
-@@ -98,8 +106,7 @@
- @:
-
- targets += $(install-file)
--$(install-file): scripts/headers_install.sh $(input-files) FORCE
-- $(if $(unwanted),$(call cmd,remove),)
-+$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
- $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
- $(call if_changed,install)
-
diff --git a/toolchain/kernel-headers/patches/3.10.37/headers-install.patch b/toolchain/kernel-headers/patches/3.10.37/headers-install.patch
new file mode 100644
index 000000000..46dc9fe13
--- /dev/null
+++ b/toolchain/kernel-headers/patches/3.10.37/headers-install.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-3.10.37.orig/scripts/Makefile.headersinst linux-3.10.37/scripts/Makefile.headersinst
+--- linux-3.10.37.orig/scripts/Makefile.headersinst 2014-04-14 15:42:31.000000000 +0200
++++ linux-3.10.37/scripts/Makefile.headersinst 2014-04-24 17:04:51.980248954 +0200
+@@ -107,7 +107,6 @@
+
+ targets += $(install-file)
+ $(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
+- $(if $(unwanted),$(call cmd,remove),)
+ $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
+ $(call if_changed,install)
+
diff --git a/toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch b/toolchain/kernel-headers/patches/3.10.37/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.10.37/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.10.36/relocs.patch b/toolchain/kernel-headers/patches/3.10.37/relocs.patch
index 649b9e73e..649b9e73e 100644
--- a/toolchain/kernel-headers/patches/3.10.36/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.10.37/relocs.patch
diff --git a/toolchain/kernel-headers/patches/3.10.36/sgidefs.patch b/toolchain/kernel-headers/patches/3.10.37/sgidefs.patch
index f00a284d9..f00a284d9 100644
--- a/toolchain/kernel-headers/patches/3.10.36/sgidefs.patch
+++ b/toolchain/kernel-headers/patches/3.10.37/sgidefs.patch
diff --git a/toolchain/kernel-headers/patches/3.10.36/sortext.patch b/toolchain/kernel-headers/patches/3.10.37/sortext.patch
index 65bbbb64b..65bbbb64b 100644
--- a/toolchain/kernel-headers/patches/3.10.36/sortext.patch
+++ b/toolchain/kernel-headers/patches/3.10.37/sortext.patch