Create initramfs images in lfs/linux

diff --git a/lfs/dracut b/lfs/dracut
index 434a7bc53fb9c385fbd29047f405d1e84b964d72..397b63c94567a6ec302cba99c62240a326477bee 100644 (file)
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -78,20 +78,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cp -vf $(DIR_SRC)/src/dracut/dracut.conf /etc/dracut.conf.d/
 
-       # Build initramdisk
-       # Strip all binaries in that initrd, because no debugging code is
-       # needed.
-
-ifeq "$(MACHINE_TYPE)" "arm"
-       # kirkwood kernel
-       dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-kirkwood.img $(KVER)-ipfire-kirkwood
-       cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-kirkwood.img uInit-ipfire-kirkwood
-       # arm7 multi kernel
-       dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-multi.img $(KVER)-ipfire-multi
-       cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-multi.img uInit-ipfire-multi
-#      cd /boot && cp -f ipfirerd-$(KVER)-multi.img zInit-ipfire-multi
-else
-       dracut --force --verbose --strip /boot/initramfs-$(KVER)-ipfire.img $(KVER)-ipfire
-endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/linux b/lfs/linux
index e62cecd751c9bd9e9e271c2ed5f2a380cc7a8fb3..27621559533c2bbb0679b87fbcb29c7b2302032d 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -293,6 +293,17 @@ ifeq "$(MACHINE_TYPE)" "arm"
                        done
 endif
 
+       # Create initramfs images
+       dracut --force --verbose --strip /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
+
+ifeq "$(KCFG)" "-kirkwood"
+       cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-kirkwood.img uInit-ipfire-kirkwood
+endif
+
+ifeq "$(KCFG)" "-multi"
+       cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-multi.img uInit-ipfire-multi
+endif
+
 ifeq "$(LASTKERNEL)" "1"
        # Only do this once
        cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/

diff --git a/make.sh b/make.sh
index beafd3342512eaa0172cbda3c01ef7590f9074af..09419201ee26c32c64489d69308503cb42e48b90 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -400,6 +400,8 @@ buildipfire() {
   ipfiremake rpi-firmware
   ipfiremake bc
   ipfiremake u-boot
+  ipfiremake cpio
+  ipfiremake dracut
 
   case "${TARGET_ARCH}" in
        i586)
@@ -459,8 +461,6 @@ buildipfire() {
   esac
   ipfiremake pkg-config
   ipfiremake linux-atm
-  ipfiremake cpio
-  ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake pam