[Cdd-commits] r415 - projects/simple-cdd/trunk
CDD Subversion Commit
noreply at alioth.debian.org
Fri Aug 4 16:58:47 UTC 2006
Author: otavio
Date: Fri Aug 4 16:58:47 2006
New Revision: 415
Modified:
projects/simple-cdd/trunk/ (props changed)
projects/simple-cdd/trunk/build-simple-cdd
projects/simple-cdd/trunk/simple-cdd-packages.list
Log:
more flexible package list and include file options.
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:58:47 2006
@@ -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: projects/simple-cdd/trunk/simple-cdd-packages.list
==============================================================================
--- projects/simple-cdd/trunk/simple-cdd-packages.list (original)
+++ projects/simple-cdd/trunk/simple-cdd-packages.list Fri Aug 4 16:58:47 2006
@@ -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
More information about the Cdd-commits
mailing list