From 22820bf25673d6d709f674796e64890af5578f2d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 1 Nov 2014 19:57:51 +0100 Subject: [PATCH] kernel: use correct external modules at initrd build. --- config/rootfiles/common/i586/linux-initrd | 1 + config/rootfiles/common/i586/linux-initrd-pae | 1 + lfs/linux | 14 ++-- lfs/linux-initrd | 70 +++++++++++++++++++ make.sh | 6 +- 5 files changed, 81 insertions(+), 11 deletions(-) create mode 100644 config/rootfiles/common/i586/linux-initrd create mode 100644 config/rootfiles/common/i586/linux-initrd-pae create mode 100644 lfs/linux-initrd diff --git a/config/rootfiles/common/i586/linux-initrd b/config/rootfiles/common/i586/linux-initrd new file mode 100644 index 0000000000..567955063b --- /dev/null +++ b/config/rootfiles/common/i586/linux-initrd @@ -0,0 +1 @@ +#boot/initramfs-KVER-ipfire.img diff --git a/config/rootfiles/common/i586/linux-initrd-pae b/config/rootfiles/common/i586/linux-initrd-pae new file mode 100644 index 0000000000..083efc245b --- /dev/null +++ b/config/rootfiles/common/i586/linux-initrd-pae @@ -0,0 +1 @@ +#boot/initramfs-KVER-ipfire-pae.img diff --git a/lfs/linux b/lfs/linux index 52efdbc0a1..bcbdeb0ffa 100644 --- a/lfs/linux +++ b/lfs/linux @@ -226,16 +226,6 @@ ifeq "$(MACHINE_TYPE)" "arm" done endif - # Create initramfs images - dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX) - -ifeq "$(KCFG)" "-kirkwood" - cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX) -endif - -ifeq "$(KCFG)" "-multi" - cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX) -endif ifeq "$(LASTKERNEL)" "1" # Only do this once @@ -264,5 +254,9 @@ ifeq "$(LASTKERNEL)" "1" endif endif + #force new build of external modules and initrd if the kernel was rebuild + -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-* @$(POSTBUILD) diff --git a/lfs/linux-initrd b/lfs/linux-initrd new file mode 100644 index 0000000000..1b048b50a0 --- /dev/null +++ b/lfs/linux-initrd @@ -0,0 +1,70 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2014 IPFire Team # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = $(KVER) + +THISAPP = linux-initrd-$(VER) + +VERSUFIX=ipfire$(KCFG) + +TARGET = $(DIR_INFO)/$(THISAPP)-$(VERSUFIX) + +############################################################################### +# Top-level Rules +############################################################################### + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + + # rebuild module deps + depmod -a $(KVER)-$(VERSUFIX) + + # Create initramfs images + dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX) + +ifeq "$(KCFG)" "-kirkwood" + cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX) +endif + +ifeq "$(KCFG)" "-multi" + cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX) +endif + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 6ea9b593bd..3121fdd31a 100755 --- a/make.sh +++ b/make.sh @@ -419,7 +419,7 @@ buildipfire() { ipfiremake e1000e KCFG="-pae" ipfiremake igb KCFG="-pae" ipfiremake ixgbe KCFG="-pae" - + ipfiremake linux-initrd KCFG="-pae" # x86 kernel build ipfiremake linux KCFG="" @@ -434,6 +434,7 @@ buildipfire() { ipfiremake e1000e KCFG="" ipfiremake igb KCFG="" ipfiremake ixgbe KCFG="" + ipfiremake linux-initrd KCFG="" ;; armv5tel) @@ -443,6 +444,7 @@ buildipfire() { # ipfiremake mISDN KCFG="-rpi" NOPCI=1 ipfiremake cryptodev KCFG="-rpi" # ipfiremake compat-drivers KCFG="-rpi" + ipfiremake linux-initrd KCFG="-rpi" # arm multi platform (Panda, Wandboard ...) kernel build ipfiremake linux KCFG="-multi" @@ -450,6 +452,7 @@ buildipfire() { ipfiremake e1000e KCFG="-multi" ipfiremake igb KCFG="-multi" ipfiremake ixgbe KCFG="-multi" + ipfiremake linux-initrd KCFG="-multi" # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build ipfiremake linux KCFG="-kirkwood" @@ -463,6 +466,7 @@ buildipfire() { ipfiremake e1000e KCFG="-kirkwood" ipfiremake igb KCFG="-kirkwood" ipfiremake ixgbe KCFG="-kirkwood" + ipfiremake linux-initrd KCFG="-kirkwood" ;; esac ipfiremake pkg-config -- 2.39.2