[Debian-NP-Commits] r213 - people/vagrant/simple-cdd
Vagrant Cascadian
debian-np-devel@lists.alioth.debian.org
Thu, 18 Nov 2004 19:05:05 -0700
Author: vagrant-guest
Date: Thu Nov 18 19:04:58 2004
New Revision: 213
Modified:
people/vagrant/simple-cdd/build-simple-cdd
people/vagrant/simple-cdd/simple-cdd-packages.list
Log:
more flexible package list and include file options.
Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd (original)
+++ people/vagrant/simple-cdd/build-simple-cdd Thu Nov 18 19:04:58 2004
@@ -14,11 +14,33 @@
. CONF.sh
-for p in $(/usr/sbin/debootstrap --print-debs sarge) ; do
+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="$TASK"
+
+for l in $package_files ; do
+ all_packages="$all_packages $(egrep -v ^# $l)"
+done
+
+if [ -x /usr/sbin/debootstrap ]; then
+ all_packages="$all_packages $(/usr/sbin/debootstrap --print-debs sarge)"
+else
+ echo "WARNING: debootstrap not found, skipping..."
+fi
+
+for p in $all_packages ; do
# FIXME make idempotent
- echo $p >> $TASK
+ echo $p >> $TASK.cache
+done
+
+mv -f $TASK $TASK.bak
+for i in $includes ; do
+ echo '#include <'"$i"'>' >> $TASK
done
+sort -u $TASK.cache >> $TASK
+
# generate the mirror
# patched debpartial-mirror for cleaner output...
http_proxy=http://localhost:3128 ./patched-debpartial-mirror -c debpartial-mirror.conf
Modified: people/vagrant/simple-cdd/simple-cdd-packages.list
==============================================================================
--- people/vagrant/simple-cdd/simple-cdd-packages.list (original)
+++ people/vagrant/simple-cdd/simple-cdd-packages.list Thu Nov 18 19:04:58 2004
@@ -1,6 +1,3 @@
-#include </usr/share/debian-cd/tasks/debian-installer+kernel>
-#include </usr/share/debian-cd/tasks/debian-installer>
-#include </usr/share/debian-cd/tasks/base-sarge>
kernel-image-2.4-386
grub