]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - lfs/linux
projects / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
linux: Fix touching incorrect version.h
[ipfire-2.x.git] / lfs / linux
diff --git a/lfs/linux b/lfs/linux
index 0994e3e5672a5efda234bf5263d2cee20c92a163..86755f46fabc9853106122e0c72c8a49b9ec5815 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.86
-ARM_PATCHES = 4.14.86-ipfire0
+VER         = 4.14.113
+ARM_PATCHES = 4.14.113-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 79
+PAK_VER    = 82
 DEPS      = ""
 
 HEADERS_ARCH  = $(BUILD_PLATFORM)
@@ -82,8 +82,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = 9ffeff88ca630a6e0ef0257b0a05b8c4
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 36b8a9adb8915cbccd18069e2f5af159
+$(DL_FILE)_MD5                                 = fd34a25839945f902f0c6d694d42ea7f
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 51eab5175bf8f0ad986006c74e60b472
 
 install : $(TARGET)
 
@@ -128,11 +128,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
 
        # Wlan Patches
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/backports-4.2.6-1_ath10k_remove_logspam.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-ath_ignore_eeprom_regd.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14_ath_user_regd.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-iwlwifi-noibss_only_on_radar_chan.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-rt2x00usb_suppress_queue_warnings.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-add_libertas_uap.patch
 
        # Add LED trigger
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.16-ledtrig_netdev.patch
@@ -144,23 +141,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8_cs5535audio_fix_logspam_on_geos.patch
 
        # Add PC Engines APU led support
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-apu_leds.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-apu_leds.patch
 
        # Fix uevent PHYSDEVDRIVER
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
 ifeq "$(KCFG)" "-kirkwood"
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
 endif
 
 ifeq "$(KCFG)" "-multi"
        # Apply Arm-multiarch kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
+
 endif
 ifeq "$(BUILD_ARCH)" "aarch64"
        # Apply Arm-multiarch kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
 endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
 
@@ -200,6 +199,46 @@ ifeq "$(BUILD_PLATFORM)" "arm"
                        done
 endif
 
+       # Recreate source and build links
+       rm -rf /lib/modules/$(VER)-$(VERSUFIX)/{build,source}
+       mkdir -p /lib/modules/$(VER)-$(VERSUFIX)/build
+       ln -sf build /lib/modules/$(VER)-$(VERSUFIX)/source
+
+       # Create dirs for extra modules
+       mkdir -p /lib/modules/$(VER)-$(VERSUFIX)/extra
+
+       cd $(DIR_APP) && cp --parents $$(find -type f -name "Makefile*" -o -name "Kconfig*") \
+               /lib/modules/$(VER)-$(VERSUFIX)/build
+       cd $(DIR_APP) && cp Module.symvers System.map /lib/modules/$(VER)-$(VERSUFIX)/build
+       rm -rf /lib/modules/$(VER)-$(VERSUFIX)/build/{Documentation,scripts,include}
+
+       cd $(DIR_APP) && cp .config /lib/modules/$(VER)-$(VERSUFIX)/build
+       cd $(DIR_APP) && cp -a scripts /lib/modules/$(VER)-$(VERSUFIX)/build
+       find /lib/modules/$(VER)-$(VERSUFIX)/build/scripts -name "*.o" -exec rm -vf {} \;
+
+       cd $(DIR_APP) && cp -a --parents arch/$(HEADERS_ARCH)/include /lib/modules/$(VER)-$(VERSUFIX)/build
+       cd $(DIR_APP) && cp -a include /lib/modules/$(VER)-$(VERSUFIX)/build/include
+
+       # Install objtool
+       cd $(DIR_APP) && cp -a tools/objtool/objtool \
+               /lib/modules/$(VER)-$(VERSUFIX)/build/tools/objtool/ || :
+       cd $(DIR_APP) && cp -a --parents tools/build/{Build,Build.include,fixdep.c} \
+               tools/scripts/utilities.mak /lib/modules/$(VER)-$(VERSUFIX)/build
+
+       # Make sure we can build external modules
+       touch -r /lib/modules/$(VER)-$(VERSUFIX)/build/Makefile \
+               /lib/modules/$(VER)-$(VERSUFIX)/build/include/generated/uapi/linux/version.h
+       touch -r /lib/modules/$(VER)-$(VERSUFIX)/build/.config \
+               /lib/modules/$(VER)-$(VERSUFIX)/build/autoconf.h
+       cp /lib/modules/$(VER)-$(VERSUFIX)/build/.config \
+               /lib/modules/$(VER)-$(VERSUFIX)/build/include/config/auto.conf
+
+       # Fix permissions
+       find /lib/modules/$(VER)-$(VERSUFIX) -name "modules.order" \
+               -exec chmod 644 {} \;
+
+       find /lib/modules/$(VER)-$(VERSUFIX) -name ".*.cmd" -exec rm -f {} \;
+
 ifeq "$(LASTKERNEL)" "1"
        # Only do this once
        cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
@@ -208,14 +247,14 @@ ifeq "$(LASTKERNEL)" "1"
        echo install drm /bin/false > /etc/modprobe.d/framebuffer.conf
 
        # Blacklist old framebuffer modules
-       for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko); do \
+       for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko.xz); do \
                echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
        done
        # Blacklist new drm framebuffer modules
-       for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko); do \
+       for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko.xz); do \
                echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
        done    
-       sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf
+       sed -i -e "s|.ko.xz||g" /etc/modprobe.d/framebuffer.conf
 
        # Disable ipv6 at runtime
        echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf
@@ -226,5 +265,5 @@ endif
        -rm -f /usr/src/log/*-kmod-$(VER)-$(VERSUFIX)
        -rm -f /usr/src/log/linux-initrd-$(VER)-$(VERSUFIX)
 
-       @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
+       @rm -rf $(DIR_APP) $(DIR_SRC)/linux
        @$(POSTBUILD)
IPFire 2.x development tree