X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flinux;h=7f44702d036e9b3fcd07788ce888d142470dca1b;hp=c5d8a8e88fc19a2bf8d5c5c3209cee026136311f;hb=1773544d025591d4096ee91bcc598dac19fa0f24;hpb=66a29eaa02a7fdf8096b212bec0cbdd7db0a12fe

diff --git a/lfs/linux b/lfs/linux
index c5d8a8e88f..7f44702d03 100644
--- 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-2020  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.50
-ARM_PATCHES = 4.14.50-ipfire0
+VER         = 4.14.172
+ARM_PATCHES = 4.14.172-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -34,12 +34,12 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 75
+PAK_VER    = 92
 DEPS	   = ""
 
+HEADERS_ARCH  = $(BUILD_PLATFORM)
 KERNEL_ARCH   = $(BUILD_ARCH)
 KERNEL_TARGET = bzImage
-HEADERS_ARCH  = $(BUILD_PLATFORM)
 
 ifeq "$(BUILD_ARCH)" "i586"
 	KERNEL_ARCH = i386
@@ -52,6 +52,7 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 endif
 
 ifeq "$(BUILD_ARCH)" "armv5tel"
+	KERNEL_ARCH  = arm
 	KERNEL_TARGET = zImage
 endif
 
@@ -81,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					= 0d397a2e14669a97d54c1b82ab2b1994
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= c38181f9fd416f10352e3dd3a01bb1d1
+$(DL_FILE)_MD5					= 782746859c7f365aeba49c08705c4c30
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= 3072dd813363b20361f80ecc748a1084
 
 install : $(TARGET)
 
@@ -117,9 +118,6 @@ $(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/linux/linux-4.14-imq.diff
-
 	# Layer7-patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-layer7.patch
 
@@ -127,11 +125,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
@@ -143,13 +138,15 @@ $(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
 
+	# Fix for netfilter nf_conntrack: resolve clash for matching conntracks
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.0-netfilter-conntrack-resolve-clash.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
 
@@ -181,6 +178,12 @@ else
 	cd $(DIR_APP) && make clean
 	cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
 
+	# Copy Module signing key configuration
+	cp -f $(DIR_SRC)/config/kernel/x509.genkey $(DIR_APP)/certs/x509.genkey
+
+	# Remove modules folder if exists
+	rm -rf /lib/modules/$(VER)-$(VERSUFIX)
+
 	# Build the kernel
 	cd $(DIR_APP) && make $(MAKETUNING) $(KERNEL_TARGET) modules
 
@@ -193,12 +196,55 @@ else
 ifeq "$(BUILD_PLATFORM)" "arm"
 	cd $(DIR_APP) && make $(MAKETUNING) dtbs
 	mkdir -p /boot/dtb-$(VER)-$(VERSUFIX)
-	cd $(DIR_APP)/arch/$(HEADERS_ARCH)/boot/dts && for f in $$(find -name *.dtb); do \
+	cd $(DIR_APP)/arch/$(KERNEL_ARCH)/boot/dts && for f in $$(find -name "*.dtb"); do \
 				cp -v --parents $$f /boot/dtb-$(VER)-$(VERSUFIX)/ ; \
 				chmod 644 /boot/dtb-$(VER)-$(VERSUFIX)/$$f ; \
 			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
+
+	# Copy module signing key for off tree modules
+	cd $(DIR_APP) && cp -f certs/signing_key.* /lib/modules/$(VER)-$(VERSUFIX)/build/certs/
+
+	# 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/
@@ -207,14 +253,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
@@ -225,5 +271,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)