]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - lfs/linux
projects / people / pmueller / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Am Pakfire weitergearbeitet.
[people/pmueller/ipfire-2.x.git] / lfs / linux
diff --git a/lfs/linux b/lfs/linux
index f1f33b23b9bcc46716d7994953c48e530c33f76d..dd6911b98795980ac9f5a11b9003b71581dfb153 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -26,8 +26,8 @@
 
 include Config
 
-PATCHLEVEL = .42
-VER        = 2.6.16.42
+PATCHLEVEL = .50
+VER        = 2.6.16.50
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,36 +40,45 @@ CXXFLAGS   =
 #
 ifeq "$(SMP)" "1"
        TARGET = $(DIR_INFO)/linux-$(VER)-smp
+else
+ifeq "$(XEN)" "1"
+       TARGET = $(DIR_INFO)/linux-$(VER)-xen
 else
        TARGET = $(DIR_INFO)/linux-$(VER)
 endif
+endif
+
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-       mISDN-CVS-2007-01-26.tar.bz2 \
+       mISDN-1_1_3.tar.gz \
        squashfs3.2-r2.tar.gz \
-       iptables-1.3.7.tar.bz2 \
+       iptables-1.3.5.tar.bz2 \
        patch-o-matic-ng-20061210.tar.bz2 \
        netfilter-layer7-v2.9.tar.gz \
-       patch-2.6.16-nath323-1.3.bz2
-
-$(DL_FILE)                                     = $(DL_FROM)/$(DL_FILE)
-patch-o-matic-ng-20061210.tar.bz2      = $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2
-iptables-1.3.7.tar.bz2                 = $(URL_IPFIRE)/iptables-1.3.7.tar.bz2
-netfilter-layer7-v2.9.tar.gz           = $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz
-patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
-squashfs3.2-r2.tar.gz                  = $(URL_IPFIRE)/squashfs3.2-r2.tar.gz
-mISDN-CVS-2007-01-26.tar.bz2           = $(URL_IPFIRE)/mISDN-CVS-2007-01-26.tar.bz2
-
-$(DL_FILE)_MD5                         = 87e998bb87839b962702815dd5aecc73
+       patch-2.6.16-nath323-1.3.bz2 \
+       openswan-2.4.8.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.5.tar.bz2                                         = $(URL_IPFIRE)/iptables-1.3.5.tar.bz2
+netfilter-layer7-v2.9.tar.gz                   = $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz
+patch-2.6.16-nath323-1.3.bz2                   = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
+squashfs3.2-r2.tar.gz                                                  = $(URL_IPFIRE)/squashfs3.2-r2.tar.gz
+mISDN-1_1_3.tar.gz                = $(URL_IPFIRE)/mISDN-1_1_3.tar.gz
+openswan-2.4.8.tar.gz                                                  = $(URL_IPFIRE)/openswan-2.4.8.tar.gz
+
+$(DL_FILE)_MD5                                                                         = cc2106c6188675187d636aa518b04958
+linux-2.6.16.33.tar.bz2_MD5                            = 22f56e3a5e7524b2bbde2696152b5ad7
 patch-o-matic-ng-20061210.tar.bz2_MD5  = 76edac76301b45f89e467b41c8cf4393
-iptables-1.3.7.tar.bz2_MD5                     = dd965bdacbb86ce2a6498829fddda6b7
-netfilter-layer7-v2.9.tar.gz_MD5               = ebf9043a5352ebe6dbd721989ef83dee
-patch-2.6.16-nath323-1.3.bz2_MD5               = f926409ff703a307baf54b57ab75d138
-squashfs3.2-r2.tar.gz_MD5                      = bf360b92eba9e6d5610196ce2e02fcd1
-mISDN-CVS-2007-01-26.tar.bz2_MD5               = 844c70dc851faffcae7549fd738c7b49
+iptables-1.3.5.tar.bz2_MD5                             = 00fb916fa8040ca992a5ace56d905ea5
+netfilter-layer7-v2.9.tar.gz_MD5       = ebf9043a5352ebe6dbd721989ef83dee
+patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
+squashfs3.2-r2.tar.gz_MD5                                      = bf360b92eba9e6d5610196ce2e02fcd1
+mISDN-1_1_3.tar.gz_MD5           = d29bcf48f16fc8a9b9f3552d111b308d
+openswan-2.4.8.tar.gz_MD5                                      = 918cc56ccf8e5d14cd2047e47450b34a
 
 install : $(TARGET)
 
@@ -98,14 +107,24 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @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
+       
+ifeq "$(XEN)" "1"
+       # XEN
+       -cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xen-3.0.4-2.6.16.x.patch
+       cd $(DIR_APP)/net/ipv4/netfilter && patch -Np0 < $(DIR_SRC)/src/patches/xen-3.0.4-netfilter-fix.patch
+endif
+
+       # An UTF8 patch from LFS
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16.27-utf8_input-1.patch
 
        # Openswan 2
        cd $(DIR_SRC) && rm -rf openswan-*
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.7.tar.gz
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.7.kernel-2.6-natt.patch
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.7.kernel-2.6-klips.patch
+       cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.8.tar.gz
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.8.kernel-2.6-klips.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.8.kernel-2.6-natt.patch
+
        cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc
 
        # H323 conntrack
@@ -119,10 +138,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.2-r2.tar.gz
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.2-r2/kernel-patches/linux-2.6.16/squashfs3.2-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.7.tar.bz2
-       cd $(DIR_SRC) && ln -sf iptables-1.3.7 iptables
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.5.tar.bz2
+       cd $(DIR_SRC) && ln -sf iptables-1.3.5 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)/ \
@@ -134,34 +160,36 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.9
        cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.9.tar.gz
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.9/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch
+ifeq "$(XEN)" "1"
+       cd $(DIR_APP)/net/ipv4/netfilter && patch -Np0 < $(DIR_SRC)/src/patches/xen-3.0.4-layer7-fix.patch
+endif
 
        # Linux Intermediate Queueing Device
+ifeq "$(XEN)" ""
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16-imq2.diff
-
-       # ip_conntrack permissions from 440 to 444
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
+endif
 
        # mISDN
        cd $(DIR_SRC) && rm -rf mISDN-*
-       cd $(DIR_SRC) && tar xfj $(DIR_DL)/mISDN-CVS-2007-01-26.tar.bz2
-       cd $(DIR_SRC)/mISDN-CVS-2007-01-26 && yes 'yes' | ./std2kern -k /usr/src/linux
+       cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_3.tar.gz
+       cd $(DIR_SRC)/mISDN-1_1_3 && yes 'yes' | ./std2kern -k /usr/src/linux
 
 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.7
+       cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.5
 endif
 
-       # Bootsplash
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bootsplash-3.1.6-2.6.15.diff
-
        # Cleanup kernel source
        cd $(DIR_APP) && make mrproper
 
-ifeq "$(SMP)" ""
-       cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) $(DIR_APP)/.config
-endif
 ifeq "$(SMP)" "1"
        cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).smp $(DIR_APP)/.config
+else
+ifeq "$(XEN)" "1"
+       cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).xen $(DIR_APP)/.config
+else
+       cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) $(DIR_APP)/.config
+endif
 endif
 
        cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
@@ -172,12 +200,18 @@ ifeq "$(SMP)" "1"
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
        cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire-smp
        cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire-smp
-       cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire
        ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
-       #cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
-       #cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
+else
+ifeq "$(XEN)" "1"
+       cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire-xen/' Makefile
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
+       cd $(DIR_APP) && cp -v vmlinuz /boot/vmlinuz-$(VER)-ipfire-xen
+       cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire-xen
+       ln -sf vmlinuz-$(VER)-ipfire-xen /boot/vmlinuz-ipfire-xen
+       cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
+       cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
 else
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
@@ -188,12 +222,18 @@ else
        ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
-       #cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
-       #cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
+endif
 endif
 
        # remove symlinked pcmcia directory
        -rm -rf /lib/modules/$(VER)-ipfire{,-smp}/pcmcia
 
+ifeq "$(SMP)" ""
+ifeq "$(XEN)" ""
+       # Only do this once on the non-SMP pass 
+       cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
+endif
+endif 
+
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
        @$(POSTBUILD)
Peter's tree of IPFire 2.x