Merge remote-tracking branch 'origin/seventeen' into seventeen

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

diff --git a/lfs/linux b/lfs/linux
index 52efdbc0a1eeeee3e23f2788cc19ee92cd1ce13e..8a1ee9c7c697c53de282d795afa2e0e69603509e 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -161,6 +161,7 @@ endif
 
 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-3.14.22-kirkwood_legacy_boot.patch
 endif
 
 ifeq "$(KCFG)" "-multi"
@@ -226,16 +227,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 +255,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)