X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fdracut;h=97d12f3f55246f5512ce6bf6e5706d659071b1b8;hb=de63e05b49ae04b883e1c5b6d628cd9fba923408;hp=434a7bc53fb9c385fbd29047f405d1e84b964d72;hpb=e92d28aa93d67d4001dcfed97a47d80d1551627d;p=ipfire-2.x.git

diff --git a/lfs/dracut b/lfs/dracut
index 434a7bc53f..97d12f3f55 100644
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -70,28 +70,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-038-always-enable-mdraid.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-038_add_sdhci-pci.patch
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install sbindir=/sbin sysconfdir=/etc
 
-	rm -rf /usr/lib/dracut/modules.d/*{bootchart,dash,fips*,modsign,busybox,convertfs,network,ifcfg,url-lib,gensplash,cms,plymouth,btrfs,crypt*,dm,dmraid,dmsquash-live,livenet,lvm,multipath,qemu*,cifs,dasd*,fcoe*,iscsi,nbd,nfs,resume,ssh-client,zfcp*,systemd*,znet,securityfs,masterkey,selinux,usrmount,uefi-lib}
-
-	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 /usr/lib/dracut/modules.d/*{biosdevname,bootchart,dash,fips*,modsign,busybox,convertfs,network,ifcfg,url-lib,gensplash,cms,plymouth,btrfs,crypt*,dm,dmraid,dmsquash-live,livenet,lvm,multipath,qemu*,cifs,dasd*,fcoe*,iscsi,nbd,nfs,resume,ssh-client,zfcp*,systemd*,znet,securityfs,masterkey,selinux,usrmount,uefi-lib}
+
+	cp -vf $(DIR_SRC)/config/dracut/dracut.conf /etc/dracut.conf
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)