[Debian-NP-Commits] r271 - people/vagrant/simple-cdd

[Vagrant Cascadian]

Author: vagrant-guest
Date: Fri Nov 26 17:49:38 2004
New Revision: 271

Modified:
   people/vagrant/simple-cdd/TODO
   people/vagrant/simple-cdd/build-simple-cdd
Log:
move BASE_INCLUDE earlier and include into all_packages.


Modified: people/vagrant/simple-cdd/TODO
==============================================================================
--- people/vagrant/simple-cdd/TODO	(original)
+++ people/vagrant/simple-cdd/TODO	Fri Nov 26 17:49:38 2004
@@ -1,7 +1,6 @@
-figure out how to get tasksel to not install anything extra during base-config
+only prompt for profiles if there is more than one profile?
 
-use preseed include mechanisms rather than simply appending to default
-preseeding file.
+get tasksel to not install any additional packages during base-config
 
 use tasksel to install packages
   generate tasksel .desc files and relevent configuration
@@ -21,8 +20,4 @@
   add packages from commandline
   add debconf preseed file from commandline
 
-implement simple profile system
-  package list and debconf preseed for each
-  early base-config menu item to select profiles
-
 make a debian package of simple-cdd

Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd	(original)
+++ people/vagrant/simple-cdd/build-simple-cdd	Fri Nov 26 17:49:38 2004
@@ -26,8 +26,18 @@
   fi
 done
 
+if [ -n "$BASE_INCLUDE" ] && [ -n "$base_include_packages" ]; then
+  mv -f $BASE_INCLUDE $BASE_INCLUDE.bak
+  echo "#ifdef ARCH_$ARCH" > $BASE_INCLUDE
+  for p in $base_include_packages ; do
+    echo $p >> $BASE_INCLUDE
+  done
+  echo "#endif" >> $BASE_INCLUDE
+  echo "" >> $BASE_INCLUDE
+fi
+
 # get lists of packages from files
-for l in $package_files ; do
+for l in $package_files $BASE_INCLUDE ; do
   all_packages="$all_packages $(egrep -v ^# $l)"
 done
 
@@ -49,16 +59,6 @@
 
 sort -u $TASK.cache >> $TASK
 
-if [ -n "$BASE_INCLUDE" ] && [ -n "$base_include_packages" ]; then
-  mv -f $BASE_INCLUDE $BASE_INCLUDE.bak
-  echo "#ifdef ARCH_$ARCH" > $BASE_INCLUDE
-  for p in $base_include_packages ; do
-    echo $p >> $BASE_INCLUDE
-  done
-  echo "#endif" >> $BASE_INCLUDE
-  echo "" >> $BASE_INCLUDE
-fi
-
 if [ -z "$do_mirror" ] || [ "$do_mirror" = "true" ] ; then
   debpartial_conf=debpartial-mirror.conf
   cp -f $debpartial_conf $debpartial_conf.bak