From 994e5ce2f93bf8beeb099a9fd38d1dc358005c30 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 26 Jun 2014 13:47:42 +0000 Subject: [PATCH] kernel: update 3.10.36->3.10.44 205-fix-headers_install.patch is obseleted by upstream commit 3246a0352e3d58380b9386570f1db1faf7edf8a8 Signed-off-by: John Crispin SVN-Revision: 41351 --- include/kernel-version.mk | 4 +- target/linux/ar7/Makefile | 2 +- target/linux/ar71xx/Makefile | 2 +- target/linux/at91/Makefile | 2 +- target/linux/atheros/Makefile | 2 +- target/linux/avr32/Makefile | 2 +- target/linux/bcm53xx/Makefile | 2 +- target/linux/brcm2708/Makefile | 2 +- target/linux/brcm47xx/Makefile | 2 +- target/linux/brcm63xx/Makefile | 2 +- target/linux/cns21xx/Makefile | 2 +- .../205-fix-headers_install.patch | 44 ------------------- target/linux/imx6/Makefile | 2 +- target/linux/ixp4xx/Makefile | 2 +- target/linux/kirkwood/Makefile | 2 +- target/linux/lantiq/Makefile | 2 +- target/linux/malta/Makefile | 2 +- target/linux/mpc85xx/Makefile | 2 +- target/linux/mvebu/Makefile | 2 +- target/linux/octeon/Makefile | 2 +- target/linux/ppc40x/Makefile | 2 +- target/linux/ppc44x/Makefile | 2 +- target/linux/ramips/Makefile | 2 +- target/linux/rb532/Makefile | 2 +- target/linux/realview/Makefile | 2 +- target/linux/sparc/Makefile | 2 +- target/linux/uml/Makefile | 2 +- target/linux/x86/Makefile | 2 +- target/linux/xburst/Makefile | 2 +- 29 files changed, 29 insertions(+), 73 deletions(-) delete mode 100644 target/linux/generic/patches-3.10/205-fix-headers_install.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 86423148f39..5f6a591bbfe 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -14,8 +14,8 @@ endif ifeq ($(LINUX_VERSION),3.9.11) LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755 endif -ifeq ($(LINUX_VERSION),3.10.36) - LINUX_KERNEL_MD5SUM:=721f76050755ec8ec88876ee350a2726 +ifeq ($(LINUX_VERSION),3.10.44) + LINUX_KERNEL_MD5SUM:=8a4006eff3bbd8aff58fe4b443223e7a endif ifeq ($(LINUX_VERSION),3.12.10) LINUX_KERNEL_MD5SUM:=93325074b7b1d7bb76fb7d4348f0aa7a diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index dd9908db461..1d0237c9ae0 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs atm MAINTAINER:=Florian Fainelli SUBTARGETS:=generic ac49x -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index e26b176ea70..b2a16f91258 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=mips16 CPU_TYPE=34kc SUBTARGETS:=generic nand mikrotik -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 8340d2aa8c1..feb800dc0bb 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -13,7 +13,7 @@ BOARDNAME:=Atmel AT91 FEATURES:=squashfs targz ext2 usb CPU_TYPE:=arm926ej-s -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index ce07dc1141b..eba9f77715d 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros AR231x/AR5312 FEATURES:=squashfs -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 290f9b3d14c..da5d541d96f 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32 FEATURES:=squashfs MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile index 339e7cddb87..1c6a916078f 100644 --- a/target/linux/bcm53xx/Makefile +++ b/target/linux/bcm53xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs usb pci pcie gpio MAINTAINER:=Hauke Mehrtens CPU_TYPE:=cortex-a9 -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index c0bf2d9d4d4..abeedb3b47f 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -15,7 +15,7 @@ MAINTAINER:=Florian Fainelli CPU_TYPE:=arm1176jzf-s CPU_SUBTYPE:=vfp -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835 diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index 1caf3467f2c..4d96a1dd858 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs usb SUBTARGETS:=generic mips74k legacy MAINTAINER:=Hauke Mehrtens -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 8ab0d7b5fcc..02596a138f7 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx SUBTARGETS:=generic smp FEATURES:=squashfs usb atm pci pcmcia usbgadget -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 MAINTAINER:=Florian Fainelli include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index 1cbf781e542..2b0d7f2edf3 100644 --- a/target/linux/cns21xx/Makefile +++ b/target/linux/cns21xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx FEATURES:=squashfs CPU_TYPE:=fa526 -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-3.10/205-fix-headers_install.patch b/target/linux/generic/patches-3.10/205-fix-headers_install.patch deleted file mode 100644 index 6914c218ecf..00000000000 --- a/target/linux/generic/patches-3.10/205-fix-headers_install.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e60cc1b011bf0f1acdb7e5168b7bed4ebb78c91f Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Wed, 9 Jan 2013 16:24:39 -0500 -Subject: [PATCH] scripts/Makefile.headersinst: install headers from scratch file - -If headers_install is executed from a deep/long directory structure, the -shell's maximum argument length can be execeeded, which breaks the operation -with: - -| make[2]: execvp: /bin/sh: Argument list too long -| make[2]: *** - -By dumping the input files to a scratch file and using xargs to read the -input list from the scratch file, we can avoid blowing out the maximum -argument size and install headers in a long path name environment. - -Signed-off-by: Bruce Ashfield -[jow@openwrt.org: adapt to Linux 3.10] -Signed-off-by: Jo-Philipp Wich ---- - scripts/Makefile.headersinst | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - ---- a/scripts/Makefile.headersinst -+++ b/scripts/Makefile.headersinst -@@ -72,7 +72,7 @@ printdir = $(patsubst $(INSTALL_HDR_PATH - quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ - file$(if $(word 2, $(all-files)),s)) - cmd_install = \ -- $(CONFIG_SHELL) $< $(installdir) $(input-files); \ -+ xargs $(CONFIG_SHELL) $< $(installdir) < $(INSTALL_HDR_PATH)/.input-files; \ - for F in $(wrapper-files); do \ - echo "\#include " > $(installdir)/$$F; \ - done; \ -@@ -101,7 +101,9 @@ targets += $(install-file) - $(install-file): scripts/headers_install.sh $(input-files) FORCE - $(if $(unwanted),$(call cmd,remove),) - $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) -+ @echo $(input-files) > $(INSTALL_HDR_PATH)/.input-files - $(call if_changed,install) -+ @rm $(INSTALL_HDR_PATH)/.input-files - - else - __headerscheck: $(subdirs) $(check-file) diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile index a4660c55e36..4e55a76bb5e 100644 --- a/target/linux/imx6/Makefile +++ b/target/linux/imx6/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=neon MAINTAINER:=Luka Perkov -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index e52076f87e4..36d3bf2cd20 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs MAINTAINER:=Imre Kaloz SUBTARGETS=generic harddisk -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index aeceb136985..d1573b06b5a 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -13,7 +13,7 @@ FEATURES:=targz usb jffs2_nand nand ubifs CPU_TYPE:=xscale MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index c59e9067de4..32bec5e6630 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -11,7 +11,7 @@ BOARDNAME:=Lantiq FEATURES:=squashfs SUBTARGETS=xway xrx200 -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 CPU_TYPE:=mips32r2 diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index b29568fdfec..92bd3e4b1ae 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -12,7 +12,7 @@ SUBTARGETS:=le be le64 be64 INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 DEVICE_TYPE:=developerboard diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 957c13f5ac4..f829df58927 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -14,7 +14,7 @@ FEATURES:=spe_fpu squashfs MAINTAINER:=Imre Kaloz SUBTARGETS=generic p1020 -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile index 30036d38442..e0edb4586ef 100644 --- a/target/linux/mvebu/Makefile +++ b/target/linux/mvebu/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=vfpv3 MAINTAINER:=Luka Perkov -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile index 5eda7b45dc1..13cbe716e5c 100644 --- a/target/linux/octeon/Makefile +++ b/target/linux/octeon/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=octeon CPU_CFLAGS_octeon:=-march=octeon -mabi=64 MAINTAINER:=John Crispin -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index a13ff7b2cb8..9e7e5d8cf03 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CPU_TYPE:=405 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index 5f29716ee44..f84aa0435fc 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs broken CPU_TYPE:=440 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 35507a95548..c9551d8d819 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ralink RT288x/RT3xxx SUBTARGETS:=rt305x mt7620a mt7620n mt7621 rt3883 rt288x FEATURES:=squashfs gpio -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index 915abba5e07..3f647036328 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -11,7 +11,7 @@ BOARD:=rb532 BOARDNAME:=Mikrotik RouterBoard 532 FEATURES:=pci targz broken -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532 diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile index 5299c17369d..fb5b9f264a2 100644 --- a/target/linux/realview/Makefile +++ b/target/linux/realview/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=mpcore CPU_SUBTYPE:=vfp MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 DEVICE_TYPE:=developerboard diff --git a/target/linux/sparc/Makefile b/target/linux/sparc/Makefile index a0ccaa92a3d..2e7083999ce 100644 --- a/target/linux/sparc/Makefile +++ b/target/linux/sparc/Makefile @@ -11,7 +11,7 @@ BOARD:=sparc BOARDNAME:=Sun UltraSPARC FEATURES+=fpu tgz ext4 squashfs broken -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 MAINTAINER:=Imre Kaloz include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index febc2f680d7..6c552e149e6 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext4 audio MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 2fdd746b152..b889de87b0b 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs ext4 vdi vmdk pcmcia targz SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan \ rdc -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 KERNELNAME:=bzImage diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index 259ffb980f1..007e3edb2c4 100644 --- a/target/linux/xburst/Makefile +++ b/target/linux/xburst/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst FEATURES:=targz nand ubifs audio SUBTARGETS:=qi_lb60 n516 n526 id800wt -LINUX_VERSION:=3.10.36 +LINUX_VERSION:=3.10.44 DEVICE_TYPE=other -- 2.30.2