Kernel: Add initial support for compulab utilite.

[ipfire-2.x.git] / lfs / linux

diff --git a/lfs/linux b/lfs/linux
index 489a1def779dc3a39d8ec828f823602c4e5aa584..b787aac470fa32fd4d46ccd57d6ad16b76412d78 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.10.15
+VER        = 3.10.24
 
-RPI_PATCHES = linux-3.10.10-c1af7c6
-GRS_PATCHES = grsecurity-2.9.1-3.10.15-ipfire1.patch.xz
+RPI_PATCHES = linux-3.10.10-grsec-c1af7c6
+GRS_PATCHES = grsecurity-2.9.1-3.10.24-ipfire1.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -74,9 +74,9 @@ $(DL_FILE)                            = $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz    = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 $(GRS_PATCHES)                         = $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5                         = 3fe22263308674d92c6d106f633eca52
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = ef9274b3ff5d05daaaa4bdbe86ad00fc
-$(GRS_PATCHES)_MD5                     = a9a6c5009cef39cfb798da1466044e33
+$(DL_FILE)_MD5                         = 4b1270dda167a0ee8bead2681e0a9965
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = f55981853573236069db5ad9fb7a4bd9
+$(GRS_PATCHES)_MD5                     = c312b94bea5dc1f489451e856590a573
 
 install : $(TARGET)
 
@@ -112,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -svf linux-$(VER) $(DIR_SRC)/linux
 
        # Linux Intermediate Queueing Device
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/imq_kernel3.10.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/imq_kernel3.10.23.patch
 
        # ipp2p 0.8.2-ipfire
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-ipp2p-0.8.2-ipfire.patch
@@ -122,11 +122,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # Grsecurity-patches
 ifneq "$(KCFG)" "-headers"
-ifneq "$(KCFG)" "-rpi"
+#ifneq "$(KCFG)" "-rpi"
        cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1
        cd $(DIR_APP) && rm localversion-grsec
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
-endif
+#endif
 endif
 
        # Disable pcspeaker autoload
@@ -165,6 +165,14 @@ ifeq "$(KCFG)" "-multi"
 #      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-3.10-smsc95xx-add_mac_addr_param.patch
+
+       # Patchset for Wandboard.
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel/wandboard/dts/0001-imx6qdl-wandboard-dts-backport.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel/wandboard/dts/0002-ARM-dts-imx6qdl-wandboard-add-gpio-lines-to-wandboar.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel/wandboard/dts/0003-ARM-dts-imx6qdl-wandboard-Add-support-for-i2c1.patch
+
+       # Patchset for Compulab Utilite.
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel/utilite/linux-3.10-compulab-utilite-support.patch
 endif
 
 ifeq "$(KCFG)" "-rpi"
@@ -191,21 +199,21 @@ else
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
 
 ifeq "$(KCFG)" "-kirkwood"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage modules
        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)" "-multi"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage modules
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/zImage-$(VERSUFIX)
 else
 ifeq "$(KCFG)" "-rpi"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage modules
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/kernel.img
 else
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage modules
        cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX)
 endif
@@ -214,7 +222,6 @@ 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 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
 
@@ -231,25 +238,25 @@ ifeq "$(LASTKERNEL)" "1"
        cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
 
        # Blacklist matroxfb_base
-       echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer
+       echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer.conf
        # Blacklist old framebuffer modules
        for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \
-               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
+               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
        done
        # Blacklist new drm framebuffer modules
        for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/*.ko); do \
-               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
+               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
        done
-       sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer
+       sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf
 
        # Blacklist isdn modules
        for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
-               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
+               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn.conf ; \
        done
-       sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
+       sed -i -e "s|.ko||g" /etc/modprobe.d/isdn.conf
 
        # Disable ipv6 at runtime
-       echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6
+       echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf
 endif
 
        # Disable geode_aes modul if exist