From 195b21ed59f3a93659c747b979693085ad30bffb Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 30 May 2005 22:46:44 +0000 Subject: [PATCH] split kernel patches into board dependend and generic git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1122 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/target/linux/linux-2.4/Makefile | 3 ++- .../linux-2.4/patches/{ => brcm}/001-bcm47xx.patch | 0 .../linux-2.4/patches/{ => brcm}/002-wl_fix.patch | 0 .../003-bcm47xx_workarounds.patch} | 0 .../004-bcm94710_mmu.patch} | 0 .../patches/{ => generic}/000-linux_mips.patch | 0 .../001-squashfs.patch} | 0 .../002-squashfs_lzma.patch} | 0 .../003-jffs2_compression.patch} | 0 .../linux-2.4/patches/generic/004-exec_pagesize.patch | 11 +++++++++++ .../patches/{ => generic}/100-ebtables.patch | 0 .../patches/{ => generic}/101-netfilter_ipp2p.patch | 0 .../patches/{ => generic}/102-netfilter_layer7.patch | 0 .../{ => generic}/103-netfilter_nat_pptp.patch | 0 .../patches/{ => generic}/104-netfilter_maxconn.patch | 0 .../patches/{ => generic}/105-netfilter_TTL.patch | 0 .../patches/{ => generic}/106-mppe_mppc.patch | 0 .../linux-2.4/patches/{ => generic}/107-cifs.patch | 0 .../{ => generic}/108-optional_aout_support.patch | 0 .../{ => generic}/109-ipsec_nat_traversal.patch | 0 .../{ => generic}/110-netdev_random_core.patch | 0 .../linux-2.4/patches/{ => generic}/200-i4l.patch | 0 .../patches/{ => generic}/201-hfc_usb_backport.patch | 0 .../patches/{ => generic}/202-pl2303_backport.patch | 0 .../patches/{ => generic}/203-hfsplus_fix.patch | 0 .../linux-2.4/patches/{ => generic}/204-net_b44.patch | 0 .../patches/{ => generic}/205-gcc_3.4_ldscript.patch | 0 .../patches/{ => generic}/206-gcc_3.4_fixes.patch | 0 .../patches/{ => generic}/207-gcc_4.0_fixes.patch | 0 29 files changed, 13 insertions(+), 1 deletion(-) rename openwrt/target/linux/linux-2.4/patches/{ => brcm}/001-bcm47xx.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => brcm}/002-wl_fix.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{006-bcm47xx_workarounds.patch => brcm/003-bcm47xx_workarounds.patch} (100%) rename openwrt/target/linux/linux-2.4/patches/{007-bcm94710_mmu.patch => brcm/004-bcm94710_mmu.patch} (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/000-linux_mips.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{003-squashfs.patch => generic/001-squashfs.patch} (100%) rename openwrt/target/linux/linux-2.4/patches/{004-squashfs_lzma.patch => generic/002-squashfs_lzma.patch} (100%) rename openwrt/target/linux/linux-2.4/patches/{005-jffs2_compression.patch => generic/003-jffs2_compression.patch} (100%) create mode 100644 openwrt/target/linux/linux-2.4/patches/generic/004-exec_pagesize.patch rename openwrt/target/linux/linux-2.4/patches/{ => generic}/100-ebtables.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/101-netfilter_ipp2p.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/102-netfilter_layer7.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/103-netfilter_nat_pptp.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/104-netfilter_maxconn.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/105-netfilter_TTL.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/106-mppe_mppc.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/107-cifs.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/108-optional_aout_support.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/109-ipsec_nat_traversal.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/110-netdev_random_core.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/200-i4l.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/201-hfc_usb_backport.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/202-pl2303_backport.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/203-hfsplus_fix.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/204-net_b44.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/205-gcc_3.4_ldscript.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/206-gcc_3.4_fixes.patch (100%) rename openwrt/target/linux/linux-2.4/patches/{ => generic}/207-gcc_4.0_fixes.patch (100%) diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile index 263339f35..af06b1154 100644 --- a/openwrt/target/linux/linux-2.4/Makefile +++ b/openwrt/target/linux/linux-2.4/Makefile @@ -169,7 +169,8 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) $(DL_DIR)/$(LINUX_BINARY_WL_DR touch $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked - $(PATCH) $(LINUX_DIR) ./patches + [ -d ./patches/$(BOARD) ] && $(PATCH) $(LINUX_DIR) ./patches/$(BOARD) + $(PATCH) $(LINUX_DIR) ./patches/generic touch $(LINUX_DIR)/.patched $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched diff --git a/openwrt/target/linux/linux-2.4/patches/001-bcm47xx.patch b/openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/001-bcm47xx.patch rename to openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch diff --git a/openwrt/target/linux/linux-2.4/patches/002-wl_fix.patch b/openwrt/target/linux/linux-2.4/patches/brcm/002-wl_fix.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/002-wl_fix.patch rename to openwrt/target/linux/linux-2.4/patches/brcm/002-wl_fix.patch diff --git a/openwrt/target/linux/linux-2.4/patches/006-bcm47xx_workarounds.patch b/openwrt/target/linux/linux-2.4/patches/brcm/003-bcm47xx_workarounds.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/006-bcm47xx_workarounds.patch rename to openwrt/target/linux/linux-2.4/patches/brcm/003-bcm47xx_workarounds.patch diff --git a/openwrt/target/linux/linux-2.4/patches/007-bcm94710_mmu.patch b/openwrt/target/linux/linux-2.4/patches/brcm/004-bcm94710_mmu.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/007-bcm94710_mmu.patch rename to openwrt/target/linux/linux-2.4/patches/brcm/004-bcm94710_mmu.patch diff --git a/openwrt/target/linux/linux-2.4/patches/000-linux_mips.patch b/openwrt/target/linux/linux-2.4/patches/generic/000-linux_mips.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/000-linux_mips.patch rename to openwrt/target/linux/linux-2.4/patches/generic/000-linux_mips.patch diff --git a/openwrt/target/linux/linux-2.4/patches/003-squashfs.patch b/openwrt/target/linux/linux-2.4/patches/generic/001-squashfs.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/003-squashfs.patch rename to openwrt/target/linux/linux-2.4/patches/generic/001-squashfs.patch diff --git a/openwrt/target/linux/linux-2.4/patches/004-squashfs_lzma.patch b/openwrt/target/linux/linux-2.4/patches/generic/002-squashfs_lzma.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/004-squashfs_lzma.patch rename to openwrt/target/linux/linux-2.4/patches/generic/002-squashfs_lzma.patch diff --git a/openwrt/target/linux/linux-2.4/patches/005-jffs2_compression.patch b/openwrt/target/linux/linux-2.4/patches/generic/003-jffs2_compression.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/005-jffs2_compression.patch rename to openwrt/target/linux/linux-2.4/patches/generic/003-jffs2_compression.patch diff --git a/openwrt/target/linux/linux-2.4/patches/generic/004-exec_pagesize.patch b/openwrt/target/linux/linux-2.4/patches/generic/004-exec_pagesize.patch new file mode 100644 index 000000000..a7b1d0406 --- /dev/null +++ b/openwrt/target/linux/linux-2.4/patches/generic/004-exec_pagesize.patch @@ -0,0 +1,11 @@ +--- linux.old/include/asm-mips/param.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux.dev/include/asm-mips/param.h 2005-05-30 02:42:06.000000000 +0200 +@@ -55,7 +55,7 @@ + #endif /* defined(__KERNEL__) */ + #endif /* defined(HZ) */ + +-#define EXEC_PAGESIZE 65536 ++#define EXEC_PAGESIZE 4096 + + #ifndef NGROUPS + #define NGROUPS 32 diff --git a/openwrt/target/linux/linux-2.4/patches/100-ebtables.patch b/openwrt/target/linux/linux-2.4/patches/generic/100-ebtables.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/100-ebtables.patch rename to openwrt/target/linux/linux-2.4/patches/generic/100-ebtables.patch diff --git a/openwrt/target/linux/linux-2.4/patches/101-netfilter_ipp2p.patch b/openwrt/target/linux/linux-2.4/patches/generic/101-netfilter_ipp2p.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/101-netfilter_ipp2p.patch rename to openwrt/target/linux/linux-2.4/patches/generic/101-netfilter_ipp2p.patch diff --git a/openwrt/target/linux/linux-2.4/patches/102-netfilter_layer7.patch b/openwrt/target/linux/linux-2.4/patches/generic/102-netfilter_layer7.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/102-netfilter_layer7.patch rename to openwrt/target/linux/linux-2.4/patches/generic/102-netfilter_layer7.patch diff --git a/openwrt/target/linux/linux-2.4/patches/103-netfilter_nat_pptp.patch b/openwrt/target/linux/linux-2.4/patches/generic/103-netfilter_nat_pptp.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/103-netfilter_nat_pptp.patch rename to openwrt/target/linux/linux-2.4/patches/generic/103-netfilter_nat_pptp.patch diff --git a/openwrt/target/linux/linux-2.4/patches/104-netfilter_maxconn.patch b/openwrt/target/linux/linux-2.4/patches/generic/104-netfilter_maxconn.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/104-netfilter_maxconn.patch rename to openwrt/target/linux/linux-2.4/patches/generic/104-netfilter_maxconn.patch diff --git a/openwrt/target/linux/linux-2.4/patches/105-netfilter_TTL.patch b/openwrt/target/linux/linux-2.4/patches/generic/105-netfilter_TTL.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/105-netfilter_TTL.patch rename to openwrt/target/linux/linux-2.4/patches/generic/105-netfilter_TTL.patch diff --git a/openwrt/target/linux/linux-2.4/patches/106-mppe_mppc.patch b/openwrt/target/linux/linux-2.4/patches/generic/106-mppe_mppc.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/106-mppe_mppc.patch rename to openwrt/target/linux/linux-2.4/patches/generic/106-mppe_mppc.patch diff --git a/openwrt/target/linux/linux-2.4/patches/107-cifs.patch b/openwrt/target/linux/linux-2.4/patches/generic/107-cifs.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/107-cifs.patch rename to openwrt/target/linux/linux-2.4/patches/generic/107-cifs.patch diff --git a/openwrt/target/linux/linux-2.4/patches/108-optional_aout_support.patch b/openwrt/target/linux/linux-2.4/patches/generic/108-optional_aout_support.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/108-optional_aout_support.patch rename to openwrt/target/linux/linux-2.4/patches/generic/108-optional_aout_support.patch diff --git a/openwrt/target/linux/linux-2.4/patches/109-ipsec_nat_traversal.patch b/openwrt/target/linux/linux-2.4/patches/generic/109-ipsec_nat_traversal.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/109-ipsec_nat_traversal.patch rename to openwrt/target/linux/linux-2.4/patches/generic/109-ipsec_nat_traversal.patch diff --git a/openwrt/target/linux/linux-2.4/patches/110-netdev_random_core.patch b/openwrt/target/linux/linux-2.4/patches/generic/110-netdev_random_core.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/110-netdev_random_core.patch rename to openwrt/target/linux/linux-2.4/patches/generic/110-netdev_random_core.patch diff --git a/openwrt/target/linux/linux-2.4/patches/200-i4l.patch b/openwrt/target/linux/linux-2.4/patches/generic/200-i4l.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/200-i4l.patch rename to openwrt/target/linux/linux-2.4/patches/generic/200-i4l.patch diff --git a/openwrt/target/linux/linux-2.4/patches/201-hfc_usb_backport.patch b/openwrt/target/linux/linux-2.4/patches/generic/201-hfc_usb_backport.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/201-hfc_usb_backport.patch rename to openwrt/target/linux/linux-2.4/patches/generic/201-hfc_usb_backport.patch diff --git a/openwrt/target/linux/linux-2.4/patches/202-pl2303_backport.patch b/openwrt/target/linux/linux-2.4/patches/generic/202-pl2303_backport.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/202-pl2303_backport.patch rename to openwrt/target/linux/linux-2.4/patches/generic/202-pl2303_backport.patch diff --git a/openwrt/target/linux/linux-2.4/patches/203-hfsplus_fix.patch b/openwrt/target/linux/linux-2.4/patches/generic/203-hfsplus_fix.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/203-hfsplus_fix.patch rename to openwrt/target/linux/linux-2.4/patches/generic/203-hfsplus_fix.patch diff --git a/openwrt/target/linux/linux-2.4/patches/204-net_b44.patch b/openwrt/target/linux/linux-2.4/patches/generic/204-net_b44.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/204-net_b44.patch rename to openwrt/target/linux/linux-2.4/patches/generic/204-net_b44.patch diff --git a/openwrt/target/linux/linux-2.4/patches/205-gcc_3.4_ldscript.patch b/openwrt/target/linux/linux-2.4/patches/generic/205-gcc_3.4_ldscript.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/205-gcc_3.4_ldscript.patch rename to openwrt/target/linux/linux-2.4/patches/generic/205-gcc_3.4_ldscript.patch diff --git a/openwrt/target/linux/linux-2.4/patches/206-gcc_3.4_fixes.patch b/openwrt/target/linux/linux-2.4/patches/generic/206-gcc_3.4_fixes.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/206-gcc_3.4_fixes.patch rename to openwrt/target/linux/linux-2.4/patches/generic/206-gcc_3.4_fixes.patch diff --git a/openwrt/target/linux/linux-2.4/patches/207-gcc_4.0_fixes.patch b/openwrt/target/linux/linux-2.4/patches/generic/207-gcc_4.0_fixes.patch similarity index 100% rename from openwrt/target/linux/linux-2.4/patches/207-gcc_4.0_fixes.patch rename to openwrt/target/linux/linux-2.4/patches/generic/207-gcc_4.0_fixes.patch