X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finitrd;h=ad8b135a638a8740079bc6685c9da0d706f063bc;hb=0dcb85e89ef1c6aa6c55cc0f4528f4d57f31226f;hp=a4aa83fb94a95bd1c1f91caa4c59dd1e372c0483;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/initrd b/lfs/initrd
index a4aa83fb94..ad8b135a63 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -54,31 +54,42 @@ $(TARGET) :
 	-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/etc && rm -f fstab
 	cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
-	rm -rf /install/initrd/etc{,/udev,/udev/rules.d}/.svn
 	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
+	#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/*,kernel/{crypro,sound,net}} \
-		/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/*
 
 	cp -aR /install/initrd/* /install/mnt
 
-	# make new dependencies
-	depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
+	# make new dependencies for installer
+	depmod -a -F /boot/System.map-$(KVER)-ipfire \
+	    -b /install/initrd $(KVER)-ipfire
 
+	# Remove binary depmod files
+	rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin
+	    
 	mksquashfs /install/initrd /install/images/initrd
 	cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log