r2680 - in dists/trunk/live-helper: debian docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-04 16:25:35 +0000 (Sat, 04 Aug 2007)
New Revision: 2680

Modified:
   dists/trunk/live-helper/debian/changelog
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_binary_yaboot
Log:


Modified: dists/trunk/live-helper/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog	2007-08-04 15:36:53 UTC (rev 2679)
+++ dists/trunk/live-helper/debian/changelog	2007-08-04 16:25:35 UTC (rev 2680)
@@ -1,9 +1,10 @@
 live-helper (1.0~a22-1) UNRELEASED; urgency=medium
 
   * New upstream release:
+    - Replacing make-live with lh_config and lh_build (Closes: #435484).
+    - Added workaround from matth in lh_binary_grub, lh_binary_syslinux and
+      lh_binary_yaboot to work under dash (Closes: #431748).
     - Using fake hostname instead of setting it at build-time (Closes: #435699).
-    - lh_config/lh_build replaces make-live now; lh_config updated
-      (Closes: #435484).
 
  -- Daniel Baumann <daniel at debian.org>  Mon,  6 Aug 2007 00:00:00 +0200
 

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-08-04 15:36:53 UTC (rev 2679)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-08-04 16:25:35 UTC (rev 2680)
@@ -4,6 +4,9 @@
 	  - Renaming LIVE_* variables to LH_*.
 	* excamples/cron/*:
 	  - Updated to make-live removal.
+	* helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
+	  - Workaround from matth over /bin/echo to avoid wrong expansion
+	    of entries when using dash (Closes: #431748).
 	* helpers/lh_chroot_hostname:
 	  - Installing fake hostname, less intrusive approach for the build
 	    system (Closes: #435699).

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-08-04 15:36:53 UTC (rev 2679)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-08-04 16:25:35 UTC (rev 2680)
@@ -199,7 +199,7 @@
 	Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`" "`basename ${DESTDIR_LIVE}`/initrd.img-${VERSION}" "${FAILSAFE}"
 done
 
-LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_LIVE="`/bin/echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
 if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
@@ -225,14 +225,14 @@
 	Grub_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
 fi
 
-LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_INSTALL="`/bin/echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
 
 # Assembling memtest configuration
 if [ -f "${DESTDIR_LIVE}"/memtest ]
 then
 	MEMTEST="title\t\tOther:\nroot"
 	MEMTEST="${MEMTEST}\n\ntitle\t\t${LH_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
-	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+	MEMTEST="`/bin/echo ${MEMTEST} | sed -e 's#//#/#g'`"
 fi
 
 # Copying templates

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-08-04 15:36:53 UTC (rev 2679)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-08-04 16:25:35 UTC (rev 2680)
@@ -265,7 +265,7 @@
 	done
 fi
 
-LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_LIVE="`/bin/echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
 if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
@@ -302,7 +302,7 @@
 	Syslinux_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
 fi
 
-LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_INSTALL="`/bin/echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
 
 # Assembling memtest configuration
 if [ -f "${DESTDIR_LIVE}"/memtest ]
@@ -316,7 +316,7 @@
 	fi
 
 	MEMTEST="LABEL memtest\n\tkernel ${KERNEL_PATH}memtest"
-	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+	MEMTEST="`/bin/echo ${MEMTEST} | sed -e 's#//#/#g'`"
 fi
 
 case "${LH_BINARY_IMAGES}" in

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-08-04 15:36:53 UTC (rev 2679)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-08-04 16:25:35 UTC (rev 2680)
@@ -212,7 +212,7 @@
 	done
 fi
 
-LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_LIVE="`/bin/echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
 if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
@@ -236,7 +236,7 @@
 	Yaboot_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
 fi
 
-LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_INSTALL="`/bin/echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
 
 case "${LH_BINARY_IMAGES}" in
 	iso|usb-hdd)