Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

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

diff --git a/lfs/initrd b/lfs/initrd
index ad8b135a638a8740079bc6685c9da0d706f063bc..42da9bc7b3067b61cc73a37e5d287b660bb57c53 100644 (file)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014  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        #
@@ -30,6 +30,8 @@ THISAPP    = initrd
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+SUP_ARCH   = i586
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -51,46 +53,69 @@ $(TARGET) :
        rm -f /install/images/initrd
 
        # Finish up initrd directory
-       -mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)-ipfire/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys} && \
+       -mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)-ipfire/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys}
+       cd /install/initrd && lzma -d -c /boot/ipfirerd-$(KVER).img | cpio -i
+
+       # Copy Files packages for installer
+       find $(DIR_SRC)/config/rootfiles/installer/* -maxdepth 1 | xargs cat | grep -v "^#" > /tmp/ROOTFILES
+
+       # Patch Kernel Version to rootfiles
+       sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
+
+       -cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
+
+       # Copy hid and network modules (and deps)
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/hid \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/net \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/pcmcia \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/ssb \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/uio \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/ptp \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/dca \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/pps \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+       # Remove wireless modules
+       rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/net/wireless
+
        cd /install/initrd/etc && rm -f fstab
        cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
        rm -rf /install/initrd/usr/share/man
-       chmod 755 /install/initrd/etc/halt /install/initrd/etc/rc
-       cp -f /usr/share/terminfo/l/linux /install/initrd/usr/share/terminfo/l
-
-       # make new dependencies 
-       depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
-       #depmod -a -F /boot/System.map-$(KVER)-ipfire-smp $(KVER)-ipfire-smp
-       
-       cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/
-       
-       rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,mISDN,source,misc/*,kernel/{sound,drivers/{acpi,bluetooth,cpufreq,hwmon,gpu,rtc,isdn,media,video,watchdog}}} \
-               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan* \
-               /install/initrd/lib/modules/$(KVER)-ipfire/net/{bridge,netfilter,ipsec} \
-               /install/initrd/lib/modules/$(KVER)-ipfire/dahdi
+       chmod 755 /install/initrd/etc/halt /install/initrd/etc/rc_installer
 
-       # ... acpi/dock.ko is needed for libata
-#      -mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi
-#      cp -a /lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko \
-#              /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko
+       cd /install/initrd/ && patch -Np0 < $(DIR_SRC)/src/patches/dracut-init_start_ipfireinstaller.patch
 
-       cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
+       # Hide udev messages
+       sed -i -e "s|err|none|g" /install/initrd/etc/udev/udev.conf
 
-       cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so
+       # make new dependencies 
+       depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
 
        -mkdir -p /install/{images,mnt}
        rm -rf /install/mnt/*
 
-       cp -aR /install/initrd/* /install/mnt
+       #Build Module deps for installer.
+       depmod -a -b /install/initrd/ -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
+
+       #Name service from dhcpcd
+       cp -f /etc/nsswitch.conf /install/initrd/etc/
+       cp -f $(DIR_SRC)/config/initrd/dhcpc/* /install/initrd/var/ipfire/dhcpc/dhcpcd-hooks/
 
-       # make new dependencies for installer
-       depmod -a -F /boot/System.map-$(KVER)-ipfire \
-           -b /install/initrd $(KVER)-ipfire
+       # Install needed locales.
+       -mkdir -pv /install/initrd/usr/lib/locale
+       for lang in $(DIR_SRC)/langs/*; do \
+               for path in /usr/lib/locale/$${lang##*/}*; do \
+                       [ -d "$${path}" ] && cp -lrvf "$${path}" /install/initrd/usr/lib/locale/; \
+               done; \
+       done
 
-       # Remove binary depmod files
-       rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin
-           
-       mksquashfs /install/initrd /install/images/initrd
+       cd /install/initrd && find . | cpio -o -H newc | lzma > /install/images/initrd
        cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log
 
        @$(POSTBUILD)