[Debian-live-changes] r2422 - in dists/trunk/live-helper: docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-07 12:27:21 +0000 (Sat, 07 Jul 2007)
New Revision: 2422

Removed:
   dists/trunk/live-helper/helpers/lh_binary_hacks
Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary
   dists/trunk/live-helper/helpers/lh_binary_includes
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-07 12:11:32 UTC (rev 2421)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-07 12:27:21 UTC (rev 2422)
@@ -8,6 +8,8 @@
 	  - Refactored.
 	* helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
 	  - Added 'quiet' for everything newer than etch.
+	* helpers/lh_binary_hacks:
+	  - Merged into lh_binary_includes.
 	* helpers/lh_chroot_hacks:
 	  - Added removal of some build-system influenced files.
 	  - Cleaned up a bit.

Modified: dists/trunk/live-helper/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary	2007-07-07 12:11:32 UTC (rev 2421)
+++ dists/trunk/live-helper/helpers/lh_binary	2007-07-07 12:27:21 UTC (rev 2422)
@@ -51,7 +51,6 @@
 lh_binary_includes ${*}
 lh_binary_local-includes ${*}
 lh_binary_local-hooks ${*}
-lh_binary_hacks ${*}
 lh_binary_md5sum ${*}
 
 # Building images

Deleted: dists/trunk/live-helper/helpers/lh_binary_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_hacks	2007-07-07 12:11:32 UTC (rev 2421)
+++ dists/trunk/live-helper/helpers/lh_binary_hacks	2007-07-07 12:27:21 UTC (rev 2422)
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# lh_binary_hacks(1) - execute hacks in binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
-
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
-	. "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="execute hacks in binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin executing hacks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_hacks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Removing live-initramfs docs
-if [ -e binary/parameters.txt.${LH_INITRAMFS} ]
-then
-	mv binary/parameters.txt.${LH_INITRAMFS} binary/parameters.txt
-fi
-rm -f binary/parameters.txt.*
-
-# Creating stage file
-Create_stagefile .stage/binary_hacks

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-07-07 12:11:32 UTC (rev 2421)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-07-07 12:27:21 UTC (rev 2422)
@@ -116,7 +116,6 @@
 	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
 fi
 
-
 if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
 then
 	# Copying install templates
@@ -161,5 +160,13 @@
 	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
 fi
 
+# Cleaning up includes
+if [ -e binary/parameters.txt.${LH_INITRAMFS} ]
+then
+	mv binary/parameters.txt.${LH_INITRAMFS} binary/parameters.txt
+fi
+
+rm -f binary/parameters.txt.*
+
 # Creating stage file
 Create_stagefile .stage/binary_includes