[DebianGIS-dev] r1767 - packages/debian-gis

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-09-10 20:31:28 +0000 (Wed, 10 Sep 2008)
New Revision: 1767

Modified:
   packages/debian-gis/build-gis-live
Log:
* adjust build script for current live-helper
* use aptitude to allow missing packages in packages-lists.


Modified: packages/debian-gis/build-gis-live
===================================================================
--- packages/debian-gis/build-gis-live	2008-09-02 10:30:06 UTC (rev 1766)
+++ packages/debian-gis/build-gis-live	2008-09-10 20:31:28 UTC (rev 1767)
@@ -2,7 +2,7 @@
 #
 # (c) 2006, 2007	Holger Levsen <debian at layer-acht.org>
 # (c) 2007 		    Petter Reinholdtsen <pere at hungry.com>
-# (c) 2007          Andreas Putzo <andreas at putzo.net>
+# (c) 2007, 2008    Andreas Putzo <andreas at putzo.net>
 #
 # Licended under GPL2
 #
@@ -11,7 +11,7 @@
 #
 # Build depends: live-helper tasksel
 #
-# Tested using live-helper version 1.0~a31-1
+# Tested using live-helper version 1.0.0-2
 #
 ##############################################################################
 
@@ -39,6 +39,7 @@
 # CD boot image
 #splashpng=foo.png
 
+LH_PACKAGES_LISTS="kde debian-gis"
 
 # helper functions
 msg_info() {
@@ -87,22 +88,24 @@
 # cleanup from previous builds
 [ -d "$build_dir" ] || mkdir -p $build_dir
 cd $build_dir
-if lh_clean all; then
+if lh_clean --all; then
     msg_info cleaning old build dir succeeded
     rm -rf config
 else
     msg_error generating configuration failed
-    exit 1
+#    exit 1
 fi
 
 # configure live-helper
-export LH_BOOTAPPEND_LIVE="quiet splash"
+LH_BOOTAPPEND_LIVE="quiet splash"
 if /usr/bin/lh_config \
+    --apt aptitude \
     --bootappend "quiet splash" \
     --keyring-packages debian-archive-keyring \
     --mirror-bootstrap "$mirror" \
+    --mirror-binary "$mirror" \
     --distribution "$dist" \
-    --sections "main" \
+    --categories 'main' \
     --apt-recommends disabled \
     --union-filesystem aufs \
     --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6' \
@@ -120,14 +123,14 @@
 # copy hooks
 if [ -d "$hook_dir" ]; then
     for hook in $(ls "$hook_dir"); do
-        cp $hook_dir/$hook config/chroot_local-hooks
+        cp -v $hook_dir/$hook config/chroot_local-hooks
     done
 fi
 
 # copy package lists
 if [ -d "$package_list_dir" ]; then
     for list in $(ls "$package_list_dir"); do
-        cp $package_list_dir/$list config/chroot_local-packageslists
+        cp -v $package_list_dir/$list config/chroot_local-packageslists
     done
 fi