X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finitrd;h=8c2bd6851872294144b888eb2371673635a9d408;hb=98935cc29adf39537114f70d3f04a78b7b4e1331;hp=e2510d1855c08637aa013e53002985f891c33e96;hpb=0fbb45e9f535e4d77699fde5ddca56e981dfa0d0;p=ipfire-2.x.git

diff --git a/lfs/initrd b/lfs/initrd
index e2510d1855..8c2bd68518 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -50,88 +50,74 @@ md5 :
 
 $(TARGET) :
 	@$(PREBUILD)
-	rm -f /install/images/{cdinitrd,cdinitrd.gz,fdinitrd,fdinitrd.gz}
-	-strip --strip-all   /install/misc/bin/*
-	-strip --strip-all   /install/initrd/bin/*
-	-strip --strip-debug /install/initrd/lib/*
+	rm -f /install/images/initrd
 
 	# Finish up initrd directory
-	-mkdir -p /install/initrd/{etc,lib/modules/$(KVER)/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run} && \
-	ln -sf /bin /install/initrd/sbin
-#	cd /install/initrd/dev && /dev/make_devices 
+	-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/CVS/
-	cd /install/initrd/dev && ln -sf fd0 floppy
+	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
 
+	# Install SCSI Drivers
+	cp -rf /lib/modules/$(KVER)-ipfire/kernel/drivers/scsi \
+		/lib/modules/$(KVER)-ipfire/kernel/drivers/block \
+		/lib/modules/$(KVER)-ipfire/kernel/drivers/ide \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+	rm -f	/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan*
+
+	# 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
+
+	cd / && tar -cvf /tmp/drivers.tar \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/{arch,crypto} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{acpi,atm,bluetooth,block,char,cdrom,connector,cpufreq,hwmon,ide} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{ieee1394,isdn,mmc,md,parport,video} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/net/{wan,ppp*,slip*,slhc*,tun*,wireless} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/usb/{atm,input,storage,host} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/usb/{3cp4218.ko,acm.ko,amedyn.ko,cxacru.ko} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/usb/{speedtch.ko,hid.ko,usbcore.ko,at76c50*.ko} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/net/{8021q,atm,bluetooth,bridge,ieee80211,ipsec,ipv4} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/net/{wanrouter,netfilter,sched} \
+		--exclude=lib/modules/$(KVER)-ipfire/{build,extra,misc,modules.*,source} \
+		lib/modules/$(KVER)-ipfire
+	cd /install/initrd/ && tar -xvf /tmp/drivers.tar && rm -f /tmp/drivers.tar
+
 	# Extra modules
-	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/scsi
-	cp -f /lib/modules/$(KVER)/kernel/drivers/scsi/{scsi_mod.ko,sd_mod.ko,sr_mod.ko} \
-	    /install/initrd/lib/modules/$(KVER)/kernel/drivers/scsi/
-	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/storage/
-	cp -f /lib/modules/$(KVER)/kernel/drivers/usb/storage/*.ko \
-	    /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/storage/
-
-	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/host/
-	cp -f /lib/modules/$(KVER)/kernel/drivers/usb/host/ehci* \
-	      /lib/modules/$(KVER)/kernel/drivers/usb/input/usbhid.ko \
-	      /lib/modules/$(KVER)/kernel/drivers/usb/core/usbcore.ko \
-	    /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/
-
-#	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/input
-#	cp -f /lib/modules/$(KVER)/kernel/drivers/input/{input.ko,keybdev.ko} \
-#	    /install/initrd/lib/modules/$(KVER)/kernel/drivers/input/
-
-#	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/pnp
-#	cp -f /lib/modules/$(KVER)/kernel/drivers/pnp/* \
-#	    /install/initrd/lib/modules/$(KVER)/kernel/drivers/pnp/
-
-	cp -f /lib/modules/$(KVER)/modules.* /install/initrd/lib/modules/$(KVER)/
-
-	# Floppy initrd
+	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage
+	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage/*.ko \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage/
+
+	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/host
+	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/host/*.ko \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/host
+
+	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/input
+	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/input/usbhid.ko \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/input
+
+	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/core
+	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/core/*.ko \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/core
+
+	cp -f /lib/modules/$(KVER)-ipfire/modules.* /install/initrd/lib/modules/$(KVER)-ipfire
+
+	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}
-	RAMDISK_SIZE=`grep CONFIG_BLK_DEV_RAM_SIZE $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) | sed -e 's/CONFIG_BLK_DEV_RAM_SIZE=//'` && \
-	    dd if=/dev/zero of=/install/images/fdinitrd bs=1k count=$${RAMDISK_SIZE}
-	for i in `seq 0 7`; do \
-	    if (! losetup /dev/loop$${i} >/dev/null 2>&1 ); then \
-	        LOOPDEV="/dev/loop$${i}" \
-                break; \
-	    fi; \
-	    done && \
-	    losetup $$LOOPDEV /install/images/fdinitrd && \
-	    mke2fs -m 0 -N 1024 $$LOOPDEV && \
-	    mount -t ext2 $$LOOPDEV /install/mnt && \
-	    rm -rf /install/mnt/lost+found && \
-	    cp -aR /install/initrd/* /install/mnt/ && \
-	    umount /install/mnt && \
-	    losetup -d $$LOOPDEV
-	gzip -9 /install/images/fdinitrd
-
-	# CDRom initrd, add vfat modules
-	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/fs
-	cp -fR /lib/modules/$(KVER)/kernel/fs/* \
-	    /install/initrd/lib/modules/$(KVER)/kernel/fs/
-
-	RAMDISK_SIZE=`grep CONFIG_BLK_DEV_RAM_SIZE $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) | sed -e 's/CONFIG_BLK_DEV_RAM_SIZE=//'` && \
-	    dd if=/dev/zero of=/install/images/cdinitrd bs=1k count=$${RAMDISK_SIZE}
-	for i in `seq 0 7`; do \
-	    if (! losetup /dev/loop$${i} >/dev/null 2>&1 ); then \
-	        LOOPDEV="/dev/loop$${i}" \
-                break; \
-	    fi; \
-	    done && \
-	    losetup $$LOOPDEV /install/images/cdinitrd && \
-	    mke2fs -m 0 -N 1024 $$LOOPDEV && \
-	    mount -t ext2 $$LOOPDEV /install/mnt && \
-	    rm -rf /install/mnt/lost+found && \
-	    cp -aR /install/initrd/* /install/mnt/ && \
-	    cd /install/mnt && tar xfz /install/images/drivers-$(VERSION).img # && \
-#	    cd /install/mnt && tar xfz /install/images/scsidrv-$(VERSION).img && \
-	    cp -a  /install/misc/bin/* /install/mnt/bin && \
-	    touch /install/mnt/CDROMBOOT && \
-	    cd / && umount /install/mnt && \
-	    losetup -d $$LOOPDEV
-	gzip -9 /install/images/cdinitrd
+	rm -rf /install/mnt/*
+
+	cp -aR /install/initrd/* /install/mnt
+
+	# make new dependencies
+	depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
+
+	mksquashfs /install/initrd /install/images/initrd
+	cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log
 
 	@$(POSTBUILD)