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

[Jaime Buffery]

Author: nestu
Date: 2005-05-25 14:20:41 +0000 (Wed, 25 May 2005)
New Revision: 15028

Modified:
   lunar-iso/branches/lunar-iso-2.6/scripts/aaa_base
Log:
Merging with sofar's trunk

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/aaa_base
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/aaa_base	2005-05-25 13:46:54 UTC (rev 15027)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/aaa_base	2005-05-25 14:20:41 UTC (rev 15028)
@@ -13,23 +13,45 @@
 chroot $ISO_TARGET ccache -M 256M
 rm -rf $ISO_TARGET/etc/ssh/ssh_host_*key $ISO_TARGET/etc/ssh/ssh_host_*key.pub
 rmdir /usr/lib/locale/*
+sed -i 's/^MAKES=.*/MAKES=/' $ISO_TARGET/etc/lunar/local/optimizations
+> $ISO_TARGET/etc/mtab
 
 # store the list of stuff in /var/cache that needs to be resurrected:
 echo "+ creating list of prepackaged modules"
 mkdir -p $ISO_SOURCE/aaa_base
 > $ISO_SOURCE/aaa_base/packages
-for mod in $(cat conf/base.list conf/extended.list) ; do
+for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
   grep "^$mod:" $ISO_TARGET/var/state/lunar/packages >> $ISO_SOURCE/aaa_base/packages
 done
 # add core tools to the list:
 echo "$ISO_LUNAR_MODULE:$ISO_DATE:installed:$ISO_DATE:" >> $ISO_SOURCE/aaa_base/packages
 
-# delete CVS dirs from templates
-find $ISO_TARGET -type d -name "CVS" -exec rm -rf {} \; &> /dev/null
+# delete .svn dirs from templates
+find $ISO_TARGET -type d -name ".svn" -exec rm -rf {} \; &> /dev/null
 
 echo "+ creating aaa_base.tar.bz2"
 # gather present files
-find $ISO_TARGET/{bin,boot,etc,home,lib,mnt,opt,root,sbin,srv,usr,var} | sort | uniq | sed "s:^$ISO_TARGET::g" | grep -v -e "^/var/cache/lunar/" -e "^/var/state/lunar/" -e "^/var/build/" -e "^/usr/share/doc" -e "^/usr/src/" -e "^/lib/modules/" -e "^/usr/include/" -e "^/usr/lib/perl" -e "^/var/lib/lunar" -e "^/etc/lunar" -e "^/var/spool" -e "^/var/log/" -e "^/var/tmp" -e "^/usr/share/" -e "^/var/lock/" -e "^/var/lib/" -e "^/var/run/"  > $ISO_TARGET/.present
+find $ISO_TARGET/{bin,boot,etc,home,lib,mnt,opt,root,sbin,srv,usr,var} | sort | uniq | sed "s:^$ISO_TARGET::g" | grep -v \
+	-e "^/var/cache/lunar/" \
+	-e "^/var/state/lunar/" \
+	-e "^/var/build/" \
+	-e "^/usr/share/doc" \
+	-e "^/usr/src/" \
+	-e "^/lib/modules/" \
+	-e "^/usr/include/" \
+	-e "^/usr/lib/perl" \
+	-e "^/var/lib/lunar" \
+	-e "^/etc/lunar" \
+	-e "^/var/spool" \
+	-e "^/var/log/" \
+	-e "^/var/tmp" \
+	-e "^/usr/share/" \
+	-e "^/var/lock/" \
+	-e "^/var/lib/" \
+	-e "^/var/run/"  > $ISO_TARGET/.present
+# add the kernel includes as well
+find $ISO_TARGET/usr/include/{linux,asm} | sed "s:^$ISO_TARGET::g" >> $ISO_TARGET/.present
+# add the install logs
 cat $ISO_TARGET/var/log/lunar/install/* | sort | uniq > $ISO_TARGET/.tracked
 diff -Bad $ISO_TARGET/.present $ISO_TARGET/.tracked | grep -e "^< " | cut -c 3- > $ISO_TARGET/.aaa_base.list
 echo "/etc/lunar/local/optimizations" >> $ISO_TARGET/.aaa_base.list