]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - lfs/linux3
projects / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
dhcp: fix build with linux3.x.
[ipfire-2.x.git] / lfs / linux3
diff --git a/lfs/linux3 b/lfs/linux3
index 09e5a0e533c73b0ff569cb7b693cace57722162f..e84fd7aa9dbf398f22fb4381aaa05a0551441060 100644 (file)
--- a/lfs/linux3
+++ b/lfs/linux3
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2012  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,12 @@
 
 include Config
 
-PATCHLEVEL = .30
-VER           = 2.6.40.30
+VER           = 3.2.23
 
-XVERS         = 3.0.30
-XVERSION      = 2
-XPATCHLEVEL   = 6
-XSUBLEVEL     = 40
-XEXTRAVERSION = .30
+RPI_PATCHES = linux-3.2-bootc-f23da7f
 
 THISAPP    = linux-$(VER)
-DL_FILE    = linux-$(XVERS).tar.bz2
+DL_FILE    = linux-$(VER).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
@@ -43,9 +38,6 @@ CXXFLAGS   =
 PAK_VER    = 20
 DEPS      = ""
 
-# Normal build or XEN build.
-#
-
 VERSUFIX=ipfire$(KCFG)
 
 ifeq "$(HEADERS)" "1"
@@ -77,19 +69,14 @@ endif
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-       patch-2.6.16-nath323-1.3.bz2 \
-       reiser4-for-2.6.32.patch.bz2 \
-       xen-patches-2.6.32-2f.tar.bz2
+       rpi-patches-$(RPI_PATCHES).patch.xz
+
 
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
-patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
-reiser4-for-2.6.32.patch.bz2           = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
-xen-patches-2.6.32-2f.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
+rpi-patches-$(RPI_PATCHES).patch.xz    = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                         = fbd04e3f1060dc71ebbf0cb644ae1573
-patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
-reiser4-for-2.6.32.patch.bz2_MD5       = 3246397973d9271eb8e6d7c97c5d2d91
-xen-patches-2.6.32-2f.tar.bz2_MD5      = b59d6f89e11accb9d40354418e13f31b
+$(DL_FILE)_MD5                         = 1fc88918d247293d236d5dc169bf0b30
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 5651c6411bb1cbdbfe4b2908c117aaf3
 
 install : $(TARGET)
 
@@ -120,41 +107,16 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-
-       # Change version from 3.x to 2.6.4x
-       cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^VERSION =.*$$/VERSION = $(XVERSION)/g" Makefile
-       cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^PATCHLEVEL =.*$$/PATCHLEVEL = $(XPATCHLEVEL)/g" Makefile
-       cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^SUBLEVEL =.*$$/SUBLEVEL = $(XSUBLEVEL)/g" Makefile
-       cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^EXTRAVERSION =.*$$/EXTRAVERSION = $(XEXTRAVERSION)/g" Makefile
-       mv $(DIR_SRC)/linux-$(XVERS) $(DIR_SRC)/linux-$(VER)
+       @rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
        ln -svf linux-$(VER) $(DIR_SRC)/linux
 
-ifeq "$(KCFG)" "-xen"
-       # Apply gentoo Xen patches
-       mkdir -p $(DIR_SRC)/xen-patches
-       cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2
-
-       for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
-               echo "*********** [Patch: $$x]"; \
-               cd $(DIR_APP) && pwd && patch -Np1 < $$x || exit 1; \
-       done
-       rm -rf $(DIR_SRC)/xen-patches
-
-       # Linux Intermediate Queueing Device
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-imq-test2.patch
-else
        # Linux Intermediate Queueing Device
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.1-imq.patch
-endif
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-imq.patch
 
        # 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
 
-       # Reiser4 (don't check if fail (some patches are already in xen patchset)
-#      -cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
-
        # ipp2p 0.8.2-ipfire
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.0-ipp2p-0.8.2-ipfire.patch
 
@@ -168,7 +130,7 @@ endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
 
        # Fix uevent PHYSDEVDRIVER
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
 ifeq "$(KCFG)" "-kirkwood"
@@ -184,15 +146,19 @@ ifeq "$(MACHINE_TYPE)" "arm"
 endif
 
 ifeq "$(KCFG)" "-omap"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-wlan-fix.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-dvi720p.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-i2c-fix.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-reboot.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-rtc-twl-irq.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-memcpy.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-0001-panda-wlan-fix.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-0002-panda-i2c.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-panda-reboot.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.x-smsc95xx-add_mac_addr_param.patch
 endif
 
+ifeq "$(KCFG)" "-rpi"
+       # Apply Raspberry Pi kernel patches.
+       cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-alsamixer.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-limit_volume.patch
+endif
+
 ifeq "$(HEADERS)" "1"
        # Install the header files
        cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install
@@ -209,12 +175,8 @@ else
        cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
        cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
        cd $(DIR_APP) && make CC="$(KGCC)" clean
-       cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile
+       cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
 
-ifeq "$(KCFG)" "-xen"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
-       cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX)
-else
 ifeq "$(KCFG)" "-kirkwood"
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage
        cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
@@ -225,6 +187,11 @@ ifeq "$(KCFG)" "-omap"
        cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
 else
+ifeq "$(KCFG)" "-rpi"
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage
+       cd /boot  && cat first32k.bin $(DIR_APP)/arch/arm/boot/Image > kernel.img
+       cd $(DIR_APP) && cp -v /boot/kernel.img /boot/vmlinuz-$(VER)-$(VERSUFIX)
+else
 ifeq "$(KCFG)" "-versatile"
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
@@ -269,10 +236,6 @@ ifeq "$(LASTKERNEL)" "1"
        echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6
 endif
 
-       # Remove mISDN modules
-       rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
-       rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
-
 ifneq "$(MACHINE_TYPE)" "arm"
        # Disable geode_aes modul
        mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \
IPFire 2.x development tree