X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Finitrd;h=cf4f2808501ff45361435e124969c0f6b7950a09;hp=79b355827e73107a76266f01f5b2167eee54cf51;hb=ab8d438fdda2b682b9e08a25fd1710312e35d1f5;hpb=ceba6fdfeb34fb63dfdc916106f225a595584882

diff --git a/lfs/initrd b/lfs/initrd
index 79b355827e..cf4f280850 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -60,18 +60,24 @@ $(TARGET) :
 
 	# 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
+	#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,source,misc/*,net/*,kernel/{crypto,sound,net,drivers/{media,video}}} \
-		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan*
+	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
 
+	# ... 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
 
 	cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
 
 	cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so
-	
+
 	-mkdir -p /install/{images,mnt}
 	rm -rf /install/mnt/*
 
@@ -80,16 +86,16 @@ $(TARGET) :
 	# make new dependencies for installer
 	depmod -a -F /boot/System.map-$(KVER)-ipfire \
 	    -b /install/initrd $(KVER)-ipfire
-	    
-	# Change priority of pata module
-	cd /install/initrd/lib/modules/$(KVER)-ipfire && grep "# \|ata\|ahci" \
-	    modules.alias > modules.alias.tmp
-	cd /install/initrd/lib/modules/$(KVER)-ipfire && grep -v "# \|ata\|ahci" \
-	    modules.alias >> modules.alias.tmp
-	cd /install/initrd/lib/modules/$(KVER)-ipfire && mv -f \
-	    modules.alias.tmp modules.alias
-
-	mksquashfs /install/initrd /install/images/initrd
+
+	# Remove binary depmod files
+	rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin
+
+	cd /install/initrd && strip --strip-all {,usr/}{,s}bin/* || true
+	cd /install/initrd && strip --strip-debug {,usr/}lib/* || true
+
+	cd /install/initrd && ln -svf sbin/init init
+
+	cd /install/initrd && find . | cpio -o -H newc | lzma > /install/images/initrd
 	cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log
 
 	@$(POSTBUILD)