[Lunar-commits] CVS: lunar-iso/scripts discover, 1.1, 1.2 initrd, 1.10, 1.11 kernels, 1.12, 1.13

[Auke Kok]

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

Modified Files:
	discover initrd kernels 
Log Message:
Bugfixes: typo, initrd fixes.


Index: discover
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/discover,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- discover	22 Nov 2004 20:43:35 -0000	1.1
+++ discover	23 Apr 2005 15:06:27 -0000	1.2
@@ -7,26 +7,12 @@
 BUILD_DIRECTORY=${ISO_SOURCE}/discover
 cd ${ISO_SOURCE}/discover
 
-# build curl without ssl first statically
-(
-  run_details curl
-  unpack $(sources curl)
-
-  cd $SOURCE_DIRECTORY
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --without-ssl
-  make
-
-  cd ${ISO_SOURCE}/discover
-  cp $SOURCE_DIRECTORY/lib/.libs/libcurl.a .
-  rm -rf $SOURCE_DIRECTORY
-)
-
 (
   run_details discover
   unpack $(sources discover)
 
   cd $SOURCE_DIRECTORY
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-curl
   make LDFLAGS=-all-static -C portability
   make LDFLAGS=-all-static -C sysdeps
   make LDFLAGS=-all-static -C lib
@@ -55,4 +41,3 @@
   rm -rf $SOURCE_DIRECTORY
 )
 
-rm libcurl.a

Index: initrd
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/initrd,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- initrd	27 Mar 2005 16:49:31 -0000	1.10
+++ initrd	23 Apr 2005 15:06:27 -0000	1.11
@@ -70,21 +70,23 @@
 for ITEM in $(find BUILD -type d -name "CVS"); do
     rm -rf $ITEM
 done
+echo "+ running ldconfig"
 chroot BUILD /sbin/ldconfig
 rm -f BUILD/etc/mtab
 ln -s /proc/mounts BUILD/etc/mtab
 
 # compile the initrd image
+echo "+ installing initrd kernels"
 for KERNEL in linux safe ; do
-  KVER=$(grep "^$KERNEL" $ISO_SOURCE/kernels/.initrd_kernels | cut -d" " -f2)
+  KVER=$(grep "^$KERNEL" $ISO_SOURCE/kernels/.initrd_kernel | cut -d" " -f2)
   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/
+    depmod -b $ISO_SOURCE/initrd/BUILD -a -F $ISO_SOURCE/kernels/$KERNEL.map $KVER
   )
   rm -rf TMP
 done

Index: kernels
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/kernels,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kernels	27 Mar 2005 16:49:31 -0000	1.12
+++ kernels	23 Apr 2005 15:06:27 -0000	1.13
@@ -138,8 +138,8 @@
 		"Grsecurity patch, SMP, 4GB"
 	# build -om "nosmp lowmem om" "fix om" \
 	# 	"OpenMosix clustering"
-	build -om-smp-4gb "smp mem om" "fix om" \
-		"OpenMosix clustering, SMP, 4GB"
+	# build -om-smp-4gb "smp mem om" "fix om" \
+	# 	"OpenMosix clustering, SMP, 4GB"
 
 else