Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into...

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

diff --git a/lfs/dracut b/lfs/dracut
index 726eedb409841827e6f7e649cf7dada2db3f9c3c..9bdb8a12db1f6c141cb422bacc761bb48272f31c 100644 (file)
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  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        #
@@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
        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) && cp -vf $(DIR_SRC)/src/dracut/switch_root.c .
 
@@ -87,7 +88,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                /usr/share/dracut/modules.d/99base/init
 
        # Build initramdisk
-       /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER).img $(KVER)-ipfire
-
+       # Strip all binaries in that initrd, because no debugging code is
+       # needed.
+       /sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER).img $(KVER)-ipfire
+
+ifeq "$(MACHINE_TYPE)" "arm"
+       #Convert initrd to uboot-image
+       cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER).img uInit
+endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)