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 cc169568043884f5168023fa59a9900efb707e6b..42da9bc7b3067b61cc73a37e5d287b660bb57c53 100644 (file)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -64,11 +64,25 @@ $(TARGET) :
 
        -cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
 
-       # Copy hid and network modules
+       # 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/
@@ -93,6 +107,14 @@ $(TARGET) :
        cp -f /etc/nsswitch.conf /install/initrd/etc/
        cp -f $(DIR_SRC)/config/initrd/dhcpc/* /install/initrd/var/ipfire/dhcpc/dhcpcd-hooks/
 
+       # 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
+
        cd /install/initrd && find . | cpio -o -H newc | lzma > /install/images/initrd
        cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log