[Lunar-commits] r15055 - lunar-iso/branches/lunar-iso-2.6/scripts

Jaime Buffery nestu at lunar-linux.org
Wed May 25 20:30:18 UTC 2005


Author: nestu
Date: 2005-05-25 20:30:16 +0000 (Wed, 25 May 2005)
New Revision: 15055

Added:
   lunar-iso/branches/lunar-iso-2.6/scripts/cachefill
   lunar-iso/branches/lunar-iso-2.6/scripts/ldd-gather
Modified:
   lunar-iso/branches/lunar-iso-2.6/scripts/etc
   lunar-iso/branches/lunar-iso-2.6/scripts/initrd
   lunar-iso/branches/lunar-iso-2.6/scripts/isofs
   lunar-iso/branches/lunar-iso-2.6/scripts/kernels
   lunar-iso/branches/lunar-iso-2.6/scripts/proper
   lunar-iso/branches/lunar-iso-2.6/scripts/rebuild
   lunar-iso/branches/lunar-iso-2.6/scripts/unpack
Log:
First phase of the merge with sofar's trunk work.


Added: lunar-iso/branches/lunar-iso-2.6/scripts/cachefill
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/cachefill	2005-05-25 19:38:18 UTC (rev 15054)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/cachefill	2005-05-25 20:30:16 UTC (rev 15055)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/lunar/config
+
+export VERBOSE=off
+optimize
+
+RESULT=0
+
+mkdir -p ${ISO_SOURCE}/{spool,cache}
+
+# unpack all the ISO required var/cache/lunar tarballs
+# in case of file conflict preserve glibc and gcc files first!
+for mod in ${ISO_LUNAR_MODULE} $(cat conf/base.list conf/base.list-$ISO_KSUFFIX conf/extended.list) ; do
+  CACHE=$mod-$(module_version $mod)-$BUILD.tar.bz2
+  if [ ! -f ${ISO_SOURCE}/cache/$CACHE ]; then
+    echo "# $CACHE"
+    cp /var/cache/lunar/$CACHE ${ISO_SOURCE}/cache/ || RESULT=1
+  fi
+done
+
+# fill var/spool/lunar dir
+for mod in $(cat conf/sources.list conf/sources.list-${ISO_KSUFFIX} conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
+  for file in $(lvu sources $mod) ; do
+    if [ ! -f ${ISO_SOURCE}/spool/$file ] ; then
+      echo -e "# /var/spool/lunar/$file"
+      cp -p /var/spool/lunar/$file ${ISO_SOURCE}/spool/ || RESULT=1
+    fi
+  done
+done
+
+if [ "$RESULT" == 0 ]; then
+    touch $ISO_TARGET/.cachefill
+fi
+exit $RESULT
+


Property changes on: lunar-iso/branches/lunar-iso-2.6/scripts/cachefill
___________________________________________________________________
Name: svn:executable
   + *

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/etc
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/etc	2005-05-25 19:38:18 UTC (rev 15054)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/etc	2005-05-25 20:30:16 UTC (rev 15055)
@@ -24,16 +24,9 @@
   echo "+ installing moonbase"
   cd $ISO_TARGET/var/lib/lunar && (
     tar xjf $ISO_SOURCE/template/moonbase.tar.bz2
-    tar tjlf $ISO_SOURCE/template/moonbase.tar.bz2 | sed 's/^/\/var\/lib\/lunar\//g' > $ISO_TARGET/var/log/lunar/install/moonbase-${ISO_DATE}
+    tar tjf $ISO_SOURCE/template/moonbase.tar.bz2 --one-file-system | sed 's/^/\/var\/lib\/lunar\//g' > $ISO_TARGET/var/log/lunar/install/moonbase-${ISO_DATE}
   )
-  chroot $ISO_TARGET /sbin/lsh add_module moonbase installed $ISO_DATE
-  echo "+ installing module.index"
-  chroot $ISO_TARGET /sbin/lsh create_module_index
-  echo "+ installing depends.cache"
-  chroot $ISO_TARGET /sbin/lsh create_depends_cache
-)
 
-(
   ZLOCAL_SOURCE=${ISO_SOURCE}/template/zlocal.tar.bz2
   ZLOCAL_TARGET=${ISO_TARGET}/var/lib/lunar/moonbase/
   LUNAR_CONF_FILE=${ISO_TARGET}/etc/lunar/local/config
@@ -41,19 +34,33 @@
   if [ -f "${ZLOCAL_SOURCE}" ]; then
      echo "unpacking zlocal tarball"
      tar xfj ${ZLOCAL_SOURCE} -C ${ZLOCAL_TARGET}
-
+  
      echo "making sure ZLOCAL_OVERRIDES is set"
      if  grep -v "\#" ${LUNAR_CONF_FILE} | grep -q "ZLOCAL_OVERRIDES" ; then
         sed -i -e 's/.*ZLOCAL_OVERRIDES=.*/ZLOCAL_OVERRIDES=on/g' ${LUNAR_CONF_FILE}    
      else
         echo "ZLOCAL_OVERRIDES=on" >> ${LUNAR_CONF_FILE}
      fi
-  fi
+  fi  
+
+  chroot $ISO_TARGET /sbin/lsh add_module moonbase installed $ISO_DATE
+  echo "+ installing module.index"
+  chroot $ISO_TARGET /sbin/lsh create_module_index
+  echo "+ installing depends.cache"
+  chroot $ISO_TARGET /sbin/lsh create_depends_cache
+  echo "+ installing plugins"
+  chroot $ISO_TARGET /sbin/lsh update_plugins
 )
-  
+
 # manual fixes needed before compiling:
 [ ! -e $ISO_TARGET/lib/cpp ] && ln -s /usr/bin/cpp $ISO_TARGET/lib/cpp
 [ ! -e $ISO_TARGET/usr/bin/cc ] && ln -s /usr/bin/gcc $ISO_TARGET/usr/bin/cc
 [ ! -e $ISO_TARGET/usr/include/gnu/stubs.h ] && mkdir -p $ISO_TARGET/usr/include/gnu && cp /usr/include/gnu/stubs.h $ISO_TARGET/usr/include/gnu/stubs.h
 
+echo "+ running ldconfig"
+chroot $ISO_TARGET /sbin/ldconfig
+
+chroot $ISO_TARGET lunar set ARCHIVE on
+
+
 touch $ISO_TARGET/.etcf

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/initrd
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/initrd	2005-05-25 19:38:18 UTC (rev 15054)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/initrd	2005-05-25 20:30:16 UTC (rev 15055)
@@ -13,51 +13,38 @@
 
 # template first
 cp -a --no-dereference template BUILD
-find BUILD -type d -name CVS -exec rm -rf {} \;
-mkdir -p BUILD/{mnt,proc,var/lib/discover/crash}
+find BUILD -type d -name '.svn' -exec rm -rf {} \; >/dev/null 2>&1
+mkdir -p BUILD/{mnt,proc,var/lib/discover}
 if [ "${ISO_KSUFFIX}" = "2.6" ]; then
    mkdir -p BUILD/sys/
 fi
 
-# Get the list of binaries from the initrd.lists,
-# so we can use get_bins_dynamic_lib_links to get to know
-# the list of libs those bins are linked to, as they as well
-# have to copied to the initrd
-(
-    cat initrd.list initrd.list-$ISO_KSUFFIX | while read ITEM DIR; do
-       case $ITEM in
-          *bin/* )  echo $ITEM
-       esac
-    done
-) > ${ISO_TARGET}/.initrd.bin.list
-
-# copy the script over to find the libs linked to
-cp get_bins_dynamic_lib_links ${ISO_TARGET}
-
-# get the list of libs linked to and strip off the trailing / off their path
-( chroot ${ISO_TARGET} ./get_bins_dynamic_lib_links /.initrd.bin.list ) | sed -e 's:^/::g' > .initrd.lib.list
-
-# remove the script, as it is in the way ;)
-rm ${ISO_TARGET}/get_bins_dynamic_lib_links
-
 echo "+ copying binaries and required files"
 # next up are the required stuff from the BUILD
-# Don't forget to copy the libs too!
-cat initrd.list initrd.list-$ISO_KSUFFIX .initrd.lib.list | while read ITEM DIR; do
-   if [ -n "$DIR" ]; then
-      mkdir -p BUILD/$DIR
-      cp -a --no-dereference "$ISO_TARGET/$ITEM" "BUILD/$DIR"
-   else
-      mkdir -p "BUILD/$(dirname $ITEM)"
-      cp -a --no-dereference "$ISO_TARGET/$ITEM" "BUILD/$(dirname $ITEM)"
-   fi
-done
+transfer()
+{
+  while read ITEM DIR; do
+     if [ -n "$DIR" ]; then
+        mkdir -p "$ISO_SOURCE/initrd/BUILD/$DIR"
+        cp --no-dereference "$ISO_TARGET/$ITEM" "$ISO_SOURCE/initrd/BUILD/$DIR"
+     else
+        mkdir -p "$ISO_SOURCE/initrd/BUILD/$(dirname $ITEM)"
+        cp --no-dereference "$ISO_TARGET/$ITEM" "$ISO_SOURCE/initrd/BUILD/$(dirname $ITEM)"
+     fi
+  done
+}
 
-rm .initrd.lib.list
+(
+  cd $ISO_TARGET
+  cat $ISO_SOURCE/initrd/initrd.list | transfer
+  cat $ISO_SOURCE/initrd/initrd.list-$ISO_KSUFFIX | transfer
+  $ISO_SOURCE/scripts/ldd-gather $ISO_SOURCE/initrd/initrd.list | transfer
+  $ISO_SOURCE/scripts/ldd-gather $ISO_SOURCE/initrd/initrd.list-$ISO_KSUFFIX | transfer
+)
 
-echo "+ filling /dev"
 
 # bare minimum of device nodes
+echo "+ filling /dev"
 mkdir -p BUILD/dev
 
 if [ "${ISO_KSUFFIX}" = "2.4" ]; then
@@ -91,25 +78,20 @@
 mkdir -p $ISO_SOURCE/aaa_dev
 tar cj -C BUILD -f $ISO_SOURCE/aaa_dev/aaa_dev.tar.bz2 dev/
 
-echo "+ stripping everything"
-for ITEM in $(find BUILD -type f); do
-    strip $ITEM > /dev/null 2>&1
-done
-for ITEM in $(find BUILD -type d -name "CVS" | tac); do
-    rm -rf $ITEM
-done
-
 # compile the initrd image
 echo "+ installing initrd kernels"
 for KERNEL in linux safe ; do
-  KVER=$(grep "^$KERNEL" $ISO_SOURCE/kernels/.initrd_kernel | cut -d" " -f2)
+  KVER=$(grep "^$KERNEL" $ISO_SOURCE/kernels/.initrd_kernels | 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/
+    echo "+ cp -a --no-dereference lib/modules/$KVER/kernel/drivers/{ide,scsi} $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/drivers/"
     cp -a --no-dereference lib/modules/$KVER/kernel/drivers/{ide,scsi} $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/drivers/
+    echo "+ cp lib/modules/$KVER/modules.* $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/"
     cp lib/modules/$KVER/* $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/
+    echo "+ depmod -b $ISO_SOURCE/initrd/BUILD -a -F $ISO_SOURCE/kernels/$KERNEL.map $KVER"
     depmod -b $ISO_SOURCE/initrd/BUILD -a -F $ISO_SOURCE/kernels/$KERNEL.map $KVER
   )
   rm -rf TMP
@@ -122,10 +104,14 @@
 cp $ISO_SOURCE/discover/conffile.dtd BUILD/usr/share/discover/dtd/
 cp $ISO_SOURCE/discover/discover.dtd BUILD/usr/share/discover/dtd/
 cp $ISO_SOURCE/discover/data/* BUILD/usr/share/discover/
-# make sure this is absolutely minimal:
-for file in $(find BUILD/{lib,bin,sbin,usr}); do
-  strip $file 2> /dev/null
+
+echo "+ stripping everything"
+for ITEM in BUILD/{bin,sbin,usr/bin,usr/sbin,lib,usr/lib}/* ; do
+    strip $ITEM > /dev/null 2>&1
 done
+for ITEM in $(find BUILD -type d -name ".svn" | tac); do
+    rm -rf $ITEM
+done
 
 chown -R root:root BUILD/*
   
@@ -157,4 +143,3 @@
 
 rm -rf initrd.raw BUILD.mnt
 # BUILD
-

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/isofs
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/isofs	2005-05-25 19:38:18 UTC (rev 15054)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/isofs	2005-05-25 20:30:16 UTC (rev 15055)
@@ -15,25 +15,43 @@
 # copy the installed code over:
 echo "+ copying installer program"
 cp lunar-install/init.d/lunar-install $ISO_TARGET/etc/init.d/
+cp lunar-install/sbin/lunar-install $ISO_TARGET/sbin/
 ln -s /etc/init.d/lunar-install $ISO_TARGET/etc/rc2.d/S20lunar-install
-cp lunar-install/sbin/lunar-install $ISO_TARGET/sbin/
-sedit "s:%VERSION%:${ISO_VERSION}:g" $ISO_TARGET/sbin/lunar-install $ISO_TARGET/etc/motd
-sedit "s:%CODENAME%:${ISO_CODENAME}:g" $ISO_TARGET/sbin/lunar-install $ISO_TARGET/etc/motd
 cp $ISO_SOURCE/lunar-install/etc/inittab $ISO_TARGET/etc/
 
-# need more:
-ln -s ../init.d/discover $ISO_TARGET/etc/rcS.d/S30discover
+echo "+ adding isolinux code"
+rm -rf $ISO_TARGET/isolinux
+mkdir $ISO_TARGET/isolinux
 
+cp $ISO_SOURCE/initrd/initrd $ISO_TARGET/isolinux/
+cp $ISO_SOURCE/kernels/linux $ISO_TARGET/isolinux/
+cp $ISO_SOURCE/kernels/safe $ISO_TARGET/isolinux/
+cp $ISO_SOURCE/memtest/memtest $ISO_TARGET/isolinux/
+
+cp $ISO_SOURCE/isolinux/{f{1,2,3,4}.txt,boot.cat,isolinux.{bin,cfg},generate-iso.sh,README} $ISO_TARGET/isolinux/
+
 echo "+ copying package listing"
 cp $ISO_SOURCE/aaa_base/packages $ISO_TARGET/.packages
 echo "+ copying aaa_base.tar.bz2"
 cp $ISO_SOURCE/aaa_base/aaa_base.tar.bz2 $ISO_TARGET/var/cache/lunar/
 echo "+ copying aaa_dev.tar.bz2"
 cp $ISO_SOURCE/aaa_dev/aaa_dev.tar.bz2 $ISO_TARGET/var/cache/lunar/
+echo "+ copying README"
+cp $ISO_SOURCE/template/README $ISO_TARGET
 
+for file in $ISO_TARGET/isolinux/{f{1,2,3,4}.txt,boot.cat,isolinux.{bin,cfg}} $ISO_TARGET/etc/motd $ISO_TARGET/etc/motd $ISO_TARGET/sbin/lunar-install $ISO_TARGET/README ; do
+  sed -i -e "s:%VERSION%:${ISO_VERSION}:g" \
+         -e "s:%CODENAME%:${ISO_CODENAME}:g" \
+         -e "s:%DATE%:${ISO_DATE}:g" \
+         -e "s:%KERNEL%:${ISO_KVER}:g" \
+	 -e "s:%CNAME%:${ISO_CNAME}:g" $file
+done
+
+# reverse approach this:
+rmdir $ISO_TARGET/var/build
 cd $ISO_TARGET
-
 touch .lunar-cd
+rm .cachefill .dirs .etcf .init .proper .rebuild .unpack
 
 mkisofs -o ../lunar-${ISO_VERSION}.iso -R \
         -V "Lunar-Linux ${ISO_CODENAME}" -v  \
@@ -42,4 +60,7 @@
         -c isolinux/boot.cat \
         -A "Lunar-${ISO_VERSION}" .
 
+touch .cachefill .dirs .etcf .init .proper .rebuild .unpack
 rm -f .lunar.cd
+cd $ISO_SOURCE
+mkdir -p $ISO_TARGET/var/build

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/kernels
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/kernels	2005-05-25 19:38:18 UTC (rev 15054)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/kernels	2005-05-25 20:30:16 UTC (rev 15055)
@@ -15,8 +15,8 @@
     mkdir patches
     cd patches
     if [ -f /var/spool/lunar/ll-$ISO_PVER.tar.bz2 ]; then
-       tar jxvf /var/spool/lunar/ll-$ISO_PVER.tar.bz2
-    fi
+		tar jxf /var/spool/lunar/ll-$ISO_PVER.tar.bz2
+	fi
 }
 
 prepare_patch()
@@ -52,16 +52,17 @@
     sedit "s/^EXTRAVERSION =.*/EXTRAVERSION = $1/" $ISO_SOURCE/kernels/linux-$ISO_KVER/Makefile
 }
 
+
 build_kernel()
 {
     echo "+ building $ISO_KVER$1"
     cd $ISO_SOURCE/kernels/linux-$ISO_KVER
     yes n | make oldconfig &&
 	if [ "${ISO_KSUFFIX}" = "2.4" ]; then
-		make dep
+               make dep
 	fi &&
-    make bzImage &&
-    make modules &&
+    make ${ISO_MAKES:+-j$ISO_MAKES} bzImage &&
+    make ${ISO_MAKES:+-j$ISO_MAKES} modules &&
     mkdir -p $ISO_SOURCE/kernels/TAR
     mkdir -p $ISO_SOURCE/kernels/BUILD
     mkdir -p $ISO_SOURCE/kernels/BUILD/boot
@@ -99,9 +100,9 @@
     prepare_version $1
     build_kernel $1 $5
     echo "$ISO_KVER$1:$4" >> $ISO_SOURCE/kernels/.kernels
-    if [ -n "$5" ]; then
-       echo "$5 $ISO_KVER$1" >> $ISO_SOURCE/kernels/.initrd_kernels
-    fi
+	if [ -n "$5" ]; then
+		echo "$5 $ISO_KVER$1" >> $ISO_SOURCE/kernels/.initrd_kernels
+	fi
 }
 
 VERBSOSE=on
@@ -141,13 +142,13 @@
 	# build -om-smp-4gb "smp mem om" "fix om" \
 	# 	"OpenMosix clustering, SMP, 4GB"
 
-else
+else # [ "${ISO_KSUFFIX}" = "2.6" ]; then
 
-	build -safe-i386 "i386 nosmp lowmem safe" "k-minor" \
+	build -safe-i386 "i386 nosmp lowmem safe" "" \
 		"Very safe i386 (default is i686) minimal kernel (no ACPI, DMA, SMP)" "safe"
-	build -normal "nosmp lowmem" "k-minor" \
+	build -normal "nosmp lowmem" "" \
 		"Normal kernel (no SMP) (RECOMMENDED)" "linux"
-#	build -smp-4gb "smp mem" "k-minor" \
+#	build -smp-4gb "smp mem" "" \
 #		"Normal SMP kernel with large memory (4GB)"
 	#build -grs "nosmp lowmem grsec" "grsec" \
 	#	"Grsecurity patch"

Added: lunar-iso/branches/lunar-iso-2.6/scripts/ldd-gather
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/ldd-gather	2005-05-25 19:38:18 UTC (rev 15054)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/ldd-gather	2005-05-25 20:30:16 UTC (rev 15055)
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+#
+# Search for the dynamic libs the binaries are linked to.
+#
+# The binaries are served as a file on the commandline ( $1 ), 
+# one binary per line.
+#
+# The result is echoed to stdout.
+#
+# The resulting list has dual appearances elimininated.
+#
+# Supports "dual linking", e.g.: 
+# binary ---[ links to ]---> symlink.so.[0-9]* ---[ points to ]---> symlink.so
+#
+# Errors are echoed to stderr. 
+# 0 exit code for success, 1 otherwise.
+#
+
+usage()
+{
+	cat << EOF >&2
+
+Usage: 
+
+   $0 file
+
+where file is a list of binaries, one per line, that you want to know
+the dynamic linking of. 
+
+EOF
+
+	exit 1
+}
+
+
+if [ $# -gt 1 ]; then
+	usage
+elif [ $# -eq 1 ]; then
+	if [ ! -f ${1} ]; then
+		usage
+	fi
+fi
+
+cat $1 | while read FILE JUNK ; do
+	if [ -x $FILE ] ; then
+		ldd $FILE
+	fi
+done | grep "=> /" | cut -d" " -f3 | sort | uniq | while read lib ; do
+    echo $lib
+    
+    LINK=`readlink $lib`
+    DIR=`dirname $lib`
+
+    if [ -e "$DIR/$LINK" ]; then
+       echo "$DIR/$LINK"
+    fi
+
+    STRIPPED=$DIR/${LINK%%.[0-9]*}
+    if [ -e "$STRIPPED" ]; then
+       echo "$STRIPPED"
+    fi
+
+done
+
+exit 0


Property changes on: lunar-iso/branches/lunar-iso-2.6/scripts/ldd-gather
___________________________________________________________________
Name: svn:executable
   + *

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/proper
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/proper	2005-05-25 19:38:18 UTC (rev 15054)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/proper	2005-05-25 20:30:16 UTC (rev 15055)
@@ -58,6 +58,14 @@
 rm -f $ISO_TARGET/etc/mtab
 ln -s /proc/mounts $ISO_TARGET/etc/mtab
 
+# e3 symlinks
+ln -s /usr/bin/e3vi $ISO_TARGET/usr/bin/vi
+ln -s /usr/bin/zile $ISO_TARGET/usr/bin/emacs
+
+mkdir -p $ISO_TARGET/var/lib/discover
+rm -f $ISO_TARGET/etc/*/*modutils
+rm -f $ISO_TARGET/etc/*/*bootmisc
+
 # this is a space killer:
 echo "+ stripping binaries"
 find $ISO_TARGET -name "lib*.so*" -exec strip {} \; 2> /dev/null
@@ -75,7 +83,7 @@
 
 # core toolset
 echo "+ archiving core tools"
-cp $ISO_SOURCE/cache/${ISO_LUNAR_MODULE}-*.tar.bz2 $ISO_TARGET/var/cache/lunar/
+cp $ISO_SOURCE/cache/${ISO_LUNAR_MODULE}-${ISO_DATE}-*.tar.bz2 $ISO_TARGET/var/cache/lunar/
 
 # more more more!
 rm -rf $ISO_TARGET/usr/src $ISO_TARGET/var/build

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/rebuild
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/rebuild	2005-05-25 19:38:18 UTC (rev 15054)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/rebuild	2005-05-25 20:30:16 UTC (rev 15055)
@@ -3,15 +3,17 @@
 echo "+ Starting rebuild of all modules"
 . /etc/lunar/config
 
+# do the parallel thingy?
+if [ -n "$ISO_MAKES" ]; then
+  sedit '/MAKES=/d' $ISO_TARGET/etc/lunar/local/optimizations
+  echo "MAKES=$ISO_MAKES" >> $ISO_TARGET/etc/lunar/local/optimizations
+fi
+
 export VERBOSE=off
 optimize
 
-# first things first
-chroot $ISO_TARGET /sbin/ldconfig
+mkdir -p $ISO_TARGET/var/build
 
-# rebuild all modules
-chroot $ISO_TARGET lunar set ARCHIVE on
-
 mount -t proc proc $ISO_TARGET/proc
 
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@@ -20,7 +22,7 @@
 echo ""
 
 for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
-  chroot $ISO_TARGET /sbin/lin --deps $mod
+  yes '' | chroot $ISO_TARGET /sbin/lin --deps $mod
 done
 
 umount $ISO_TARGET/proc &> /dev/null
@@ -35,7 +37,7 @@
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 echo ""
 
-chroot $ISO_TARGET lin linux-${ISO_KSUFFIX}
+yes '' | chroot $ISO_TARGET lin linux-${ISO_KSUFFIX}
 chroot $ISO_TARGET lin kernel-headers-${ISO_KSUFFIX}
 
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@@ -52,6 +54,8 @@
 
 # openssh installs ssh keys so these are now tracked in the module :^(
 chroot $ISO_TARGET /sbin/lin -c openssh
+# e2fsprogs nabs /etc/mtab
+chroot $ISO_TARGET /sbin/lin -c e2fsprogs
 
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 echo "+          REBUILD FINISHED                            +"

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/unpack
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/unpack	2005-05-25 19:38:18 UTC (rev 15054)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/unpack	2005-05-25 20:30:16 UTC (rev 15055)
@@ -8,10 +8,6 @@
 resurrect ()
 {
   CACHE=$1-$(module_version $1)-$BUILD.tar.bz2
-  if [ ! -f cache/$CACHE ]; then
-    echo "# $CACHE"
-    cp /var/cache/lunar/$CACHE cache/
-  fi
   if [ ! -f cache/$CACHE ] ; then
     echo -e "\n! $1: $CACHE missing"
   else
@@ -38,10 +34,6 @@
     echo -n "."
     if [ -f ${ISO_SOURCE}/spool/$file ] ; then
       cp -p ${ISO_SOURCE}/spool/$file $ISO_TARGET/var/spool/lunar/
-    elif [ -f /var/spool/lunar/$file ] ; then
-      echo -e "\n# /var/spool/lunar/$file"
-      cp -p /var/spool/lunar/$file ${ISO_SOURCE}/spool/
-      cp -p /var/spool/lunar/$file $ISO_TARGET/var/spool/lunar/
     else
       echo -ne "\n! $mod: $file\n"
     fi



More information about the Lunar-commits mailing list