diff --git a/package/linux/kernel-patches/001-linux-2.4.patch.bz2 b/package/linux/kernel-patches/001-linux-2.4.patch.bz2 new file mode 100644 index 0000000000..2cc1210c74 Binary files /dev/null and b/package/linux/kernel-patches/001-linux-2.4.patch.bz2 differ diff --git a/package/linux/kernel-patches/003_kbuild_fixes.diff.bz2 b/package/linux/kernel-patches/003_kbuild_fixes.diff.bz2 new file mode 100644 index 0000000000..4494739ab2 Binary files /dev/null and b/package/linux/kernel-patches/003_kbuild_fixes.diff.bz2 differ diff --git a/package/linux/kernel-patches/004_386_emu.diff.bz2 b/package/linux/kernel-patches/004_386_emu.diff.bz2 new file mode 100644 index 0000000000..f48b5496bf Binary files /dev/null and b/package/linux/kernel-patches/004_386_emu.diff.bz2 differ diff --git a/package/linux/kernel-patches/005_modularize_vesafb.diff.bz2 b/package/linux/kernel-patches/005_modularize_vesafb.diff.bz2 new file mode 100644 index 0000000000..8f187e37c6 Binary files /dev/null and b/package/linux/kernel-patches/005_modularize_vesafb.diff.bz2 differ diff --git a/package/linux/kernel-patches/006-ieee1394-hotplug.bz2 b/package/linux/kernel-patches/006-ieee1394-hotplug.bz2 deleted file mode 100644 index b8361ba35b..0000000000 Binary files a/package/linux/kernel-patches/006-ieee1394-hotplug.bz2 and /dev/null differ diff --git a/package/linux/kernel-patches/006_init_unshare.diff.bz2 b/package/linux/kernel-patches/006_init_unshare.diff.bz2 new file mode 100644 index 0000000000..374282dfe6 Binary files /dev/null and b/package/linux/kernel-patches/006_init_unshare.diff.bz2 differ diff --git a/package/linux/kernel-patches/007-scsi_add_remove_single.bz2 b/package/linux/kernel-patches/007-scsi_add_remove_single.bz2 index 0d2ee20a93..cf6138b126 100644 Binary files a/package/linux/kernel-patches/007-scsi_add_remove_single.bz2 and b/package/linux/kernel-patches/007-scsi_add_remove_single.bz2 differ diff --git a/package/linux/kernel-patches/010-optimize-for-size.bz2 b/package/linux/kernel-patches/010-optimize-for-size.bz2 index 68c19d4bbb..50a85f173c 100644 Binary files a/package/linux/kernel-patches/010-optimize-for-size.bz2 and b/package/linux/kernel-patches/010-optimize-for-size.bz2 differ diff --git a/package/linux/kernel-patches/015_cramfs_initrd.diff.bz2 b/package/linux/kernel-patches/015_cramfs_initrd.diff.bz2 new file mode 100644 index 0000000000..1cbbbd5d70 Binary files /dev/null and b/package/linux/kernel-patches/015_cramfs_initrd.diff.bz2 differ diff --git a/package/linux/kernel-patches/062-silence-blk-queue.bz2 b/package/linux/kernel-patches/062-silence-blk-queue.bz2 index 84a9a05c79..b305f783bb 100644 Binary files a/package/linux/kernel-patches/062-silence-blk-queue.bz2 and b/package/linux/kernel-patches/062-silence-blk-queue.bz2 differ diff --git a/package/linux/kernel-patches/067-squashfs2.patch.bz2 b/package/linux/kernel-patches/067-squashfs2.patch.bz2 new file mode 100644 index 0000000000..10af3587de Binary files /dev/null and b/package/linux/kernel-patches/067-squashfs2.patch.bz2 differ diff --git a/package/linux/kernel-patches/076-nmap-freak.bz2 b/package/linux/kernel-patches/076-nmap-freak.bz2 new file mode 100644 index 0000000000..b1f2709e8a Binary files /dev/null and b/package/linux/kernel-patches/076-nmap-freak.bz2 differ diff --git a/package/linux/kernel-patches/077-orinoco-0.13e.bz2 b/package/linux/kernel-patches/077-orinoco-0.13e.bz2 index b181185281..7f2bfb3dc5 100644 Binary files a/package/linux/kernel-patches/077-orinoco-0.13e.bz2 and b/package/linux/kernel-patches/077-orinoco-0.13e.bz2 differ diff --git a/package/linux/kernel-patches/078-hostap.bz2 b/package/linux/kernel-patches/078-hostap.bz2 index f9ce7aaade..e41e233933 100644 Binary files a/package/linux/kernel-patches/078-hostap.bz2 and b/package/linux/kernel-patches/078-hostap.bz2 differ diff --git a/package/linux/kernel-patches/079-jiffies64.bz2 b/package/linux/kernel-patches/079-jiffies64.bz2 index 1b6873d3ec..cdca59a12c 100644 Binary files a/package/linux/kernel-patches/079-jiffies64.bz2 and b/package/linux/kernel-patches/079-jiffies64.bz2 differ diff --git a/package/linux/kernel-patches/100_VERSION.bz2 b/package/linux/kernel-patches/100_VERSION.bz2 index 9bfe01ce28..d1b3cff713 100644 Binary files a/package/linux/kernel-patches/100_VERSION.bz2 and b/package/linux/kernel-patches/100_VERSION.bz2 differ diff --git a/package/linux/linux.config b/package/linux/linux.config index d268d77842..d7a02606eb 100644 --- a/package/linux/linux.config +++ b/package/linux/linux.config @@ -99,6 +99,11 @@ CONFIG_I82365=y CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_COMPAQ is not set # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set +# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set +# CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set +# CONFIG_HOTPLUG_PCI_PCIE is not set +# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y @@ -152,6 +157,7 @@ CONFIG_APM_REAL_MODE_POWER_OFF=y # CONFIG_CISS_MONITOR_THREAD is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_SX8 is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_RAM=y @@ -196,6 +202,7 @@ CONFIG_IP_ROUTE_TOS=y # CONFIG_ARPD is not set CONFIG_INET_ECN=y # CONFIG_SYN_COOKIES is not set +CONFIG_IP_NMAP_FREAK_PATCH=y # # IP: Netfilter Configuration @@ -259,11 +266,7 @@ CONFIG_IP_NF_ARP_MANGLE=y # # SCTP Configuration (EXPERIMENTAL) # -CONFIG_IPV6_SCTP__=y # CONFIG_IP_SCTP is not set -# CONFIG_SCTP_HMAC_NONE is not set -CONFIG_SCTP_HMAC_SHA1=y -# CONFIG_SCTP_HMAC_MD5 is not set # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set @@ -302,7 +305,7 @@ CONFIG_NET_SCH_SFQ=y CONFIG_NET_SCH_TEQL=y CONFIG_NET_SCH_TBF=y CONFIG_NET_SCH_GRED=y -CONFIG_NET_SCH_DELAY=y +# CONFIG_NET_SCH_NETEM is not set CONFIG_NET_SCH_DSMARK=y CONFIG_NET_SCH_INGRESS=y CONFIG_NET_QOS=y @@ -344,6 +347,7 @@ CONFIG_BLK_DEV_IDE=y # # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD is not set +# CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_BLK_DEV_IDEDISK=y CONFIG_IDEDISK_MULTI_MODE=y CONFIG_IDEDISK_STROKE=y @@ -375,8 +379,8 @@ CONFIG_IDEDMA_PCI_WIP=y # CONFIG_BLK_DEV_ALI15X3 is not set # CONFIG_WDC_ALI15X3 is not set # CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_ATIIXP is not set # CONFIG_AMD74XX_OVERRIDE is not set +# CONFIG_BLK_DEV_ATIIXP is not set # CONFIG_BLK_DEV_CMD64X is not set # CONFIG_BLK_DEV_TRIFLEX is not set # CONFIG_BLK_DEV_CY82C693 is not set @@ -555,6 +559,11 @@ CONFIG_PCMCIA_HERMES=m CONFIG_HOSTAP_CS=m # CONFIG_AIRO_CS is not set # CONFIG_PCMCIA_ATMEL is not set + +# +# Prism54 PCI/PCMCIA GT/Duette Driver - 802.11(a/b/g) +# +# CONFIG_PRISM54 is not set CONFIG_NET_WIRELESS=y # @@ -717,6 +726,7 @@ CONFIG_VFAT_FS=y # CONFIG_JFFS_FS is not set # CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set +CONFIG_SQUASHFS=y CONFIG_TMPFS=y CONFIG_RAMFS=y # CONFIG_ISO9660_FS is not set diff --git a/package/linux/linux.mk b/package/linux/linux.mk index 0171b7e2aa..afd098eb40 100644 --- a/package/linux/linux.mk +++ b/package/linux/linux.mk @@ -22,9 +22,9 @@ ifneq ($(filter $(TARGETS),linux),) # Version of Linux to download and then apply patches to -DOWNLOAD_LINUX_VERSION=2.4.26 +DOWNLOAD_LINUX_VERSION=2.4.27 # Version of Linux AFTER patches -LINUX_VERSION=2.4.26-erik +LINUX_VERSION=2.4.28-pre4-erik LINUX_FORMAT=bzImage #LINUX_FORMAT=images/zImage.prep @@ -45,13 +45,12 @@ LINUX_SOURCE_DIR=$(LINUX_DIR) $(DL_DIR)/$(LINUX_SOURCE): - -mkdir $(DL_DIR) + -mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) - -mkdir $(TOOL_BUILD_DIR) - #mkdir -p $(LINUX_DIR) - #rm -rf $(LINUX_DIR) + -mkdir -p $(TOOL_BUILD_DIR) + -(cd $(TOOL_BUILD_DIR); ln -sf $(LINUX_DIR) linux) bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION)) # Rename the dir from the downloaded version to the AFTER patch version @@ -59,7 +58,6 @@ ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION)) endif mkdir -p package/linux/kernel-patches toolchain/patch-kernel.sh $(LINUX_DIR) package/linux/kernel-patches - -(cd $(TOOL_BUILD_DIR); ln -sf $(LINUX_DIR) linux) touch $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG):