[Lunar-commits] CVS: lunar-iso/scripts initrd, 1.4, 1.5 kernels, 1.9, 1.10

[Auke Kok]

Update of /var/cvs/lunar/lunar-iso/scripts
In directory espresso.foo-projects.org:/tmp/cvs-serv31897

Modified Files:
	initrd kernels 
Log Message:
Fix kernels for the initrd, depmod them properly too


Index: initrd
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/initrd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- initrd	4 Feb 2005 09:17:46 -0000	1.4
+++ initrd	4 Feb 2005 12:22:33 -0000	1.5
@@ -12,18 +12,18 @@
 rm -rf BUILD
 
 # template first
-cp -a template BUILD
+cp -a --no-dereference template BUILD
 
 echo "+ copying binaries and required files"
 # next up are the required stuff from the BUILD
 for ITEM in $(cat initrd.list); do
     mkdir -p "BUILD/$(dirname $ITEM)"
-    cp -a "$ISO_TARGET/$ITEM" "BUILD/$(dirname $ITEM)"
+    cp -a --no-dereference "$ISO_TARGET/$ITEM" "BUILD/$(dirname $ITEM)"
 done
 echo "+ filling /dev"
 # bare minimum of device nodes
 mkdir -p BUILD/dev
-cp -a $ISO_TARGET/etc/makedev.d/* BUILD/etc/makedev.d/
+cp -a --no-dereference $ISO_TARGET/etc/makedev.d/* BUILD/etc/makedev.d/
 cp template/etc/makedev.d/small BUILD/etc/makedev.d/generic
 $ISO_TARGET/dev/MAKEDEV -c BUILD/etc/makedev.d/ -d BUILD/dev generic
 # strip it down even more
@@ -42,9 +42,16 @@
 # compile the initrd image
 for KERNEL in linux safe ; do
   KVER=$(file -k $ISO_SOURCE/kernels/$KERNEL | sed 's/.*\(version .*\)/\1/' | cut -d' ' -f2)
-  mkdir -p BUILD/lib/modules/$KVER/kernel/drivers/
-  cp -a $ISO_TARGET/lib/modules/$KVER/kernel/drivers/{ide,scsi} BUILD/lib/modules/$KVER/kernel/drivers/
-  depmod -b BUILD/ -a -F $KERNEL.map
+  mkdir TMP
+  (
+    cd TMP
+    tar xjf $ISO_SOURCE/kernels/TAR/$KVER.tar.bz2
+    mkdir -p $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/drivers/
+    depmod -b . -a -F $ISO_SOURCE/kernels/$KERNEL.map $KVER
+    cp -a --no-dereference lib/modules/$KVER/kernel/drivers/{ide,scsi} $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/drivers/
+    cp lib/modules/$KVER/* $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/
+  )
+  rm -rf TMP
 done
 
 # install discover in the initrd BUILD

Index: kernels
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/kernels,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kernels	4 Feb 2005 09:17:46 -0000	1.9
+++ kernels	4 Feb 2005 12:22:33 -0000	1.10
@@ -88,7 +88,7 @@
     prepare_patch $(echo $3)
     prepare_options $(echo $2)
     prepare_version $1
-    build_kernel $1 $6
+    build_kernel $1 $5
     echo "$ISO_KVER$1:$4" >> $ISO_SOURCE/kernels/.kernels
 }