ppcrcd/trunk/Makefile

[sparky]

Author: sparky
Date: Tue Jan 17 23:22:13 2006
New Revision: 6840

Modified:
   ppcrcd/trunk/Makefile
Log:
- get initrd module list from modules.list file, and not from variable


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Tue Jan 17 23:22:13 2006
@@ -7,8 +7,6 @@
 BCOND = --without python --without smp --without doc
 CFLAGS = -Os -fsigned-char -falign-loops=0 -falign-jumps=0 -falign-functions=0
 
-INITRDMODULES = scsi_mod sd_mod sr_mod via82cxxx ide-generic \
-		cdrom ide-cd isofs nls_base
 
 R = out/rpm/rpms
 P = out/rpm/prep
@@ -79,23 +77,24 @@
 	$(SU) chown $$USER $@
 	touch $@
 
-$(root_initrd):	out/touch/root_installed initrd.dir
+$(root_initrd):	out/touch/root_installed initrd.dir \
+		initrd.dir/etc/modules.list
 	$(SU) rm -rf $@{,.work}
 	cp -r initrd.dir $@.work
 	find $@.work -name .svn | xargs rm -rf
 	sed -e 's/@_VERSION_@/$(VERSION)/g'	\
 		-i $@.work/linuxrc
-	for MOD in $(INITRDMODULES); do \
-		find $(root_inst)/lib/modules/ -name $$MOD.ko.gz \
-			-exec cp "{}" $@.work/lib/modules ";"; \
-	done
+	while read MOD coment; do					\
+		find $(root_inst)/lib/modules/ -name $$MOD.ko.gz	\
+			-exec cp "{}" $@.work/lib/modules ";";		\
+	done < initrd.dir/etc/modules.list
 	gunzip $@.work/lib/modules/*
-	cd $@.work/dev; while read T M m N; do	\
+	cd $@.work/dev; while read T M m N; do			\
 		case "$$T" in					\
 			c|b)	$(SU) mknod $$N $$T $$M $$m;;	\
 			p)	mkfifo $$N;;			\
 			l)	ln -s $$N $$M;;			\
-		esac;					\
+		esac;						\
 	done < devs
 	cp $(root_inst)/bin/initrd-busybox $@.work/bin
 	$(SU) find $@.work -user $$USER | $(SU) xargs chown root