Revert "python-six: Removal of python2 & 3 addon versions of six"

[people/pmueller/ipfire-2.x.git] / lfs / linux-initrd

diff --git a/lfs/linux-initrd b/lfs/linux-initrd
index b5cc42212deaf917ae078257fd09de245b3d9f2c..25386b1bf828fb9ca3afc7bb8dd4e73ccce62060 100644 (file)
--- a/lfs/linux-initrd
+++ b/lfs/linux-initrd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  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        #
@@ -57,21 +57,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # rebuild module deps
        depmod -a $(KVER)-$(VERSUFIX)
 
-       #skip initrd build on pae and rpi kernel.
-ifneq "$(KCFG)" "-rpi"
-ifneq "$(KCFG)" "-pae"
-
        # 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
+       dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
 
 ifeq "$(KCFG)" "-multi"
-       cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
+       cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
+       cd /boot && rm initramfs-$(KVER)-$(VERSUFIX).img
 endif
 
+ifeq "$(BUILD_ARCH)" "aarch64"
+       cd /boot && mkimage -A arm64 -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
+       # dont remove initramfs because grub need this to boot.
 endif
-endif
+
        @$(POSTBUILD)