[Cdd-commits] r417 - projects/simple-cdd/trunk

[CDD Subversion Commit]

Author: otavio
Date: Fri Aug  4 16:59:22 2006
New Revision: 417

Modified:
   projects/simple-cdd/trunk/   (props changed)
   projects/simple-cdd/trunk/CONF.sh
   projects/simple-cdd/trunk/build-simple-cdd
Log:
move variables into conf file, use $BASEDIR instead of hard-coded paths



Modified: projects/simple-cdd/trunk/CONF.sh
==============================================================================
--- projects/simple-cdd/trunk/CONF.sh	(original)
+++ projects/simple-cdd/trunk/CONF.sh	Fri Aug  4 16:59:22 2006
@@ -286,6 +286,9 @@
 # default, official_images, builds everything.
 #IMAGETARGET=official_images
 
+# path to simple-cdd stuff
+simple_cdd_path="$HOME/nobackup/simple-cdd"
+
 export MIRROR=$simple_cdd_path/mirror
 export TDIR=$simple_cdd_path/tmp
 export OUT=$simple_cdd_path/images
@@ -298,3 +301,12 @@
 # increase the size limit if debian-cd tries to make more CDs than you
 # want, and the generated CDs are smaller than 650MB.
 export SIZELIMIT=739631360
+
+# these are generally debian-cd files which should get included
+includes="$BASEDIR/tasks/debian-installer+kernel $BASEDIR/tasks/debian-installer $BASEDIR/tasks/base-sarge"
+
+# files which contain lists of packages
+package_files=""
+
+# list of packages to mirror
+all_packages=""

Modified: projects/simple-cdd/trunk/build-simple-cdd
==============================================================================
--- projects/simple-cdd/trunk/build-simple-cdd	(original)
+++ projects/simple-cdd/trunk/build-simple-cdd	Fri Aug  4 16:59:22 2006
@@ -2,10 +2,9 @@
 
 # TODO add packages from commandline
 # TODO add packages from file given
-# TODO merge variables into the config file
 # TODO rename the configuration file
 
-simple_cdd_path="$HOME/nobackup/simple-cdd"
+. CONF.sh
 
 mkdir -p "$simple_cdd_path"
 
@@ -14,17 +13,7 @@
   exit 1
 fi
 
-# include files that should be added to the task
-includes="/usr/share/debian-cd/tasks/debian-installer+kernel /usr/share/debian-cd/tasks/debian-installer /usr/share/debian-cd/tasks/base-sarge"
-
-# files which contain lists of packages
-package_files=""
-
-# list of packages to mirror
-all_packages=""
-
-. CONF.sh
-
+# get lists of packages from files
 for l in $package_files $TASK ; do
   all_packages="$all_packages $(egrep -v ^# $l)"
 done
@@ -35,8 +24,8 @@
   echo "WARNING: debootstrap not found, skipping..."
 fi
 
+mv -f $TASK.cache $TASK.cache.bak
 for p in $all_packages ; do
-  # FIXME make idempotent
   echo $p >> $TASK.cache
 done
 
@@ -62,7 +51,7 @@
 mkdir -p sarge/main/installer-i386/current
 rsync --delete -aWHr sid/main/installer-i386/current/. sarge/main/installer-i386/current/
 
-cd /usr/share/debian-cd
+cd $BASEDIR
 
 echo simple-cdd: distclean
 make distclean