###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2018 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 #
include Config
-VER = 4.14.2
-RPI_PATCHES = 3.14.79-grsec-ipfire1
+VER = 4.14.26
A7M_PATCHES = 3.14.79-grsec-ipfire1
ifeq "$(TOOLCHAIN)" "1"
TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)-tools
- HEADERS_PREFIX = /tools
+ HEADERS_PREFIX = $(TOOLS_DIR)
else
TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
HEADERS_PREFIX = /usr
# Top-level Rules
###############################################################################
objects =$(DL_FILE) \
- rpi-patches-$(RPI_PATCHES).patch.xz \
arm7-multi-patches-$(A7M_PATCHES).patch.xz
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
-rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
-$(DL_FILE)_MD5 = 0164a000bd7b302037de4e91dff3018b
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a02a7fd54c642c1e3578a00ed22f54f8
+$(DL_FILE)_MD5 = cae6af140de3e5c44fe6829257b34064
arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 6c3b11e51caa278dbeacd1e23c2b171b
install : $(TARGET)
cd $(DIR_APP) && install -v -m644 include/uapi/linux/switch.h /usr/include/linux/
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/linux-3.14.79-rpi-suspend-not-inline.patch
-endif
-
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
ifeq "$(KCFG)" "-headers"
cd $(DIR_APP) && make $(MAKETUNING) 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) 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) bzImage modules
cd $(DIR_APP) && cp -v arch/$(KERNEL_ARCH)/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
endif
-endif
endif
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
# Only do this once
cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
- # Blacklist matroxfb_base
- echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer.conf
+ # disable drm by install drm to /bin/false because i915 ignore blacklisting
+ 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 -name *fb.ko); do \
+ for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko); do \
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 \
+ for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko); do \
echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
- done
+ done
sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf
# Blacklist isdn modules