]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - lfs/linux
projects / people / teissler / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
modified: lfs/l7-protocols
[people/teissler/ipfire-2.x.git] / lfs / linux
diff --git a/lfs/linux b/lfs/linux
index 20a4137aed3d7a0d50afa1bde2e32208d83548ed..073c882e35b1e7b9dd7c796465bd07aaae4f6d62 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .21
-VER        = 2.6.27.21
+PATCHLEVEL = .23
+VER        = 2.6.27.23
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -34,17 +34,18 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-ifeq "$(firstword $(MAKEFILES))" "linux-xen"
-       XEN=1
-endif
+PROG      = linux-xen
+PAK_VER    = 1
+DEPS      = ""
 
 # Normal build or XEN build.
 #
 ifeq "$(XEN)" "1"
-       TARGET = $(DIR_INFO)/linux-$(VER)-xen
+       VERSUFIX=ipfire-xen
 else
-       TARGET = $(DIR_INFO)/linux-$(VER)
+       VERSUFIX=ipfire
 endif
+TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -61,7 +62,7 @@ patch-2.6.16-nath323-1.3.bz2          = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 squashfs3.4.tar.gz                     = $(URL_IPFIRE)/squashfs3.4.tar.gz
 reiser4-for-2.6.27.19.patch.bz2                = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
 
-$(DL_FILE)_MD5                         = 2912af7938fae1a3f2a9a6bcf8c0009f
+$(DL_FILE)_MD5                         = 42db72b93641da2fe9fb0eb2ae6388d6
 netfilter-layer7-v2.21.tar.gz_MD5      = 838422e7d9a06b42e682e9064e5210b5
 patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
 squashfs3.4.tar.gz_MD5                 = 2a4d2995ad5aa6840c95a95ffa6b1da6
@@ -100,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -s linux-$(VER) /usr/src/linux
 
        # Linux Intermediate Queueing Device
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-imq.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3.patch
 
        # Xen
 ifeq "$(XEN)" "1"
@@ -182,9 +183,6 @@ endif
        # 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
     
-       # 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.27.19.patch.bz2 | patch -Np1
        
@@ -207,59 +205,38 @@ endif
        # Cleanup kernel source
        cd $(DIR_APP) && make mrproper
 
-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
+       cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
        cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
-endif
-
        cd $(DIR_APP) && make CC="$(KGCC)" clean
+       cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile
 
 ifeq "$(XEN)" "1"
-       cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire-xen/' Makefile
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)"
-       cd $(DIR_APP) && cp -v vmlinux /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
-       cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
+       cd $(DIR_APP) && cp -v vmlinux /boot/vmlinuz-$(VER)-$(VERSUFIX)
 else
-       cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
-       cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire
-       cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire
-       cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire
-       ln -sf vmlinuz-$(VER)-ipfire /boot/vmlinuz-ipfire
-       ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire
+       cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
+endif
+       cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
+       cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
+       ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX)
+       ln -sf System.map-$(VER)-$(VERSUFIX) /boot/System.map-$(VERSUFIX)
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
-endif
 
 ifeq "$(XEN)" ""
        # Only do this once on the non-XEN pass
        cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
 endif 
 
-ifeq "$(XEN)" "1"
-       # Rename ide-cd module to match with old kernel
-       mv /lib/modules/$(VER)-ipfire-xen/kernel/drivers/ide/ide-cd_mod.ko \
-           /lib/modules/$(VER)-ipfire-xen/kernel/drivers/ide/ide-cd.ko
-
-       # Remove mISDN modules
-       rm -rvf /lib/modules/$(VER)-ipfire-xen/kernel/drivers/isdn/mISDN
-       rm -rvf /lib/modules/$(VER)-ipfire-xen/kernel/drivers/isdn/hardware/mISDN
-else
        # 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
+       mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd_mod.ko \
+          /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd.ko
 
        # Remove mISDN modules
-       rm -rvf /lib/modules/$(VER)-ipfire/kernel/drivers/isdn/mISDN
-       rm -rvf /lib/modules/$(VER)-ipfire/kernel/drivers/isdn/hardware/mISDN
-endif
+       rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
+       rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
 
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
        @$(POSTBUILD)
Timo's tree of IPFire 2.x