include Config
-PATCHLEVEL = .21
-VER = 2.6.20.21
+PATCHLEVEL = .19
+VER = 2.6.25.19
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
TARGET = $(DIR_INFO)/linux-$(VER)
endif
-
###############################################################################
# Top-level Rules
###############################################################################
objects =$(DL_FILE) \
- mISDN-1_1_5.tar.gz \
- squashfs3.3.tgz \
- iptables-1.3.8.tar.bz2 \
- patch-o-matic-ng-20061210.tar.bz2 \
- netfilter-layer7-v2.18.tar.gz \
+ mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz \
+ squashfs3.4.tar.gz \
+ netfilter-layer7-v2.20.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
- openswan-2.4.12.tar.gz
-
-$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
-patch-o-matic-ng-20061210.tar.bz2 = $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2
-iptables-1.3.8.tar.bz2 = $(URL_IPFIRE)/iptables-1.3.8.tar.bz2
-netfilter-layer7-v2.18.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.18.tar.gz
+ reiser4-for-2.6.25.patch.bz2
+
+$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
+netfilter-layer7-v2.20.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.20.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
-squashfs3.3.tgz = $(URL_IPFIRE)/squashfs3.3.tgz
-mISDN-1_1_5.tar.gz = $(URL_IPFIRE)/mISDN-1_1_5.tar.gz
-openswan-2.4.12.tar.gz = $(URL_IPFIRE)/openswan-2.4.12.tar.gz
-
-$(DL_FILE)_MD5 = fbedc192e654735936cc780da8deeba4
-patch-o-matic-ng-20061210.tar.bz2_MD5 = 76edac76301b45f89e467b41c8cf4393
-iptables-1.3.8.tar.bz2_MD5 = 0a9209f928002e5eee9cdff8fef4d4b3
-netfilter-layer7-v2.18.tar.gz_MD5 = 8d2e2c00f5c20e8c0852998035aeffd2
+squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
+mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz = $(URL_IPFIRE)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz
+reiser4-for-2.6.25.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.25.patch.bz2
+
+$(DL_FILE)_MD5 = 1b20d2d2a5a0f119372a166eaf816e13
+netfilter-layer7-v2.20.tar.gz_MD5 = 525a821c973b730c8feaf9eedb57d1e4
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
-squashfs3.3.tgz_MD5 = 95c40fca0d886893631b5de14a0af25b
-mISDN-1_1_5.tar.gz_MD5 = 93b1cff7817b82638a0475c2b7b7f1b6
-openswan-2.4.12.tar.gz_MD5 = 0bca0cc205d2d83eff64a7cea825ce7a
+squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
+mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz_MD5 = a46a2d15bd0341edfbd77d257ed3fe4d
+reiser4-for-2.6.25.patch.bz2_MD5 = 4294bbcb39e5ee859b94b09ff4fb1e0c
install : $(TARGET)
md5 : $(subst %,%_MD5,$(objects))
+dist:
+ @$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
@rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ln -s linux-$(VER) /usr/src/linux
- # Openswan 2
- cd $(DIR_SRC) && rm -rf openswan-*
- cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.12.tar.gz
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6-klips.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6.20.21-natt.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6.20-cryptoalg.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12-missing-files.patch
- cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc
+ # Not report deprecated syscall 1.23 (for kudzu)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
+
+ # Fix crash on Twinhead H12Y notebooks
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-h12y-mmio-quirks.patch
- # Reiser4
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.20.patch
+ # Openswan
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
+ # Reiser4
+ cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.25.patch.bz2 | patch -Np1
+
# SquashFS
cd $(DIR_SRC) && rm -rf squashfs*
- cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.3.tgz
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.3/kernel-patches/linux-2.6.20/squashfs3.3-patch
+ cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.4.tar.gz
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.25/squashfs3.4-patch
# ip_conntrack permissions from 440 to 444
- cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
-
- # Some VIA patches
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/padlock-prereq-2.6.16.diff
- #cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/epia_dma.patch
-
- # Patch-o-matic
- cd $(DIR_SRC) && rm -rf iptables-* patch-o-matic*
- cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.8.tar.bz2
- cd $(DIR_SRC) && ln -sf iptables-1.3.8 iptables
- #cd $(DIR_SRC) && tar xfj $(DIR_DL)/patch-o-matic-ng-20061210.tar.bz2
- #cd $(DIR_SRC)/patch-o-matic-ng* && \
- # ./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ \
- # --iptables-path=$(ROOT)/usr/src/iptables/ \
- # sip-conntrack-nat rtsp-conntrack-nat \
- # mms-conntrack-nat
+# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
+
+ # ipp2p 0.8.2-pomng
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.17-ipp2p-0.8.2-pomng.patch
# Layer7-patch
- cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.18
- cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.18.tar.gz
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/for_older_kernels/kernel-2.6.20-2.6.21-layer7-2.16.1.patch
+ cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.20
+ cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.20.tar.gz
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.20/kernel-2.6.25-layer7-2.20.patch
# Linux Intermediate Queueing Device
ifeq "$(XEN)" ""
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20-imq.diff
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25-imq5.diff
endif
# mISDN
cd $(DIR_SRC) && rm -rf mISDN-*
- cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_5.tar.gz
- cd $(DIR_SRC)/mISDN-1_1_5 && yes 'yes' | ./std2kern -k /usr/src/linux
+ cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz
+ cd $(DIR_SRC)/mISDN.git && yes 'yes' | ./std2kern -k /usr/src/linux
- cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch
-
-ifeq "$(SMP)" ""
- # Only do this once on the non-SMP pass
- cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.8
-endif
+# cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch
# Cleanup kernel source
cd $(DIR_APP) && make mrproper
cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
endif
+ # Rename ide-cd module to match with old kernel
+ mv /lib/modules/$(VER)-ipfire/kernel/drivers/ide/ide-cd_mod.ko \
+ /lib/modules/$(VER)-ipfire/kernel/drivers/ide/ide-cd.ko
+
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
@$(POSTBUILD)