X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fdracut;h=aacf7474f69da3408d0a334c99a245d0615bd3ee;hp=029bc380ddebf9015955e83ffd4688c507389fab;hb=52ecb188bcc2fd922fca816f80b6db609d89002a;hpb=bc8fe5ffbb538e38eb92070a5b2256bf4fb6e74d

diff --git a/lfs/dracut b/lfs/dracut
index 029bc380d..aacf7474f 100644
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2013  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        #
@@ -73,6 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_lzma.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_cdrom_wait.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_add_run_dir.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_scsi_wait.patch
 
 	cd $(DIR_APP) && cp -vf $(DIR_SRC)/src/dracut/switch_root.c .
 
@@ -92,11 +94,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# needed.
 
 ifeq "$(MACHINE_TYPE)" "arm"
-	# versatile kernel
-	/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-versatile.img $(KVER)-ipfire-versatile
 	# kirkwood kernel
 	/sbin/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
+	/sbin/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
 	/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER).img $(KVER)-ipfire
 endif