From e4793268a3d14e945a96466441e31259c0df6e1b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 19 Jul 2011 11:57:14 +0200
Subject: Enabling hooks based on the mode we're building for.

---
 scripts/build/lb_chroot             |  2 +-
 scripts/build/lb_chroot_hooks       | 95 +++++++++++++++++++++++++++++++++++++
 scripts/build/lb_chroot_local-hooks | 70 ---------------------------
 3 files changed, 96 insertions(+), 71 deletions(-)
 create mode 100755 scripts/build/lb_chroot_hooks
 delete mode 100755 scripts/build/lb_chroot_local-hooks

(limited to 'scripts/build')

diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index d0df15ec1..c01941817 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -72,7 +72,7 @@ done
 lb chroot_live-packages ${*}
 lb chroot_local-includes ${*}
 lb chroot_local-patches ${*}
-lb chroot_local-hooks ${*}
+lb chroot_hooks ${*}
 lb chroot_hacks ${*}
 lb chroot_interactive ${*}
 
diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
new file mode 100755
index 000000000..1f62832e1
--- /dev/null
+++ b/scripts/build/lb_chroot_hooks
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'execute local hooks in chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin executing local hooks..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+## Processing distribution hooks
+
+# Copying hooks
+for _HOOK in ${LB_CHROOT_HOOKS}
+do
+	if [ -e "${LB_BASE}/hooks/???-${_HOOK}.chroot" ]
+	then
+		mkdir -p chroot/root/lb_chroot_hooks
+		cp "${LB_BASE}/hooks/???-${_HOOK}.chroot" chroot/root/lb_chroot_hooks
+	fi
+done
+
+# Running hooks
+if ls chroot/root/lb_chroot_hooks/* > /dev/null 2>&1
+then
+	for _HOOK in chroot/root/lb_chroot_hooks/*
+	do
+		Chroot chroot "/root/$(basename ${_HOOK})" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
+		rm -f chroot/root/"$(basename ${_HOOK})"
+	done
+
+	rmdir chroot/root/lb_chroot_hooks
+fi
+
+## Processing local hooks
+
+if Find_files config/hooks/*.chroot
+then
+	# Restoring cache
+	Restore_cache cache/packages_chroot
+
+	for _HOOK in config/hooks/*.chroot
+	do
+		# Copying hook
+		cp "${_HOOK}" chroot/root
+
+		# Making hook executable
+		if [ ! -x chroot/root/"$(basename ${_HOOK})" ]
+		then
+			chmod +x chroot/root/"$(basename ${_HOOK})"
+		fi
+
+		# Executing hook
+		Chroot chroot "/root/$(basename ${_HOOK})" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
+
+		# Removing hook
+		rm -f chroot/root/"$(basename ${_HOOK})"
+	done
+
+	# Saving cache
+	Save_cache cache/packages_chroot
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_hooks
+fi
diff --git a/scripts/build/lb_chroot_local-hooks b/scripts/build/lb_chroot_local-hooks
deleted file mode 100755
index f7bc57468..000000000
--- a/scripts/build/lb_chroot_local-hooks
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
-##
-## live-build 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
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'execute local hooks in chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin executing local hooks..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-hooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing local-hooks
-if Find_files config/hooks/*.chroot
-then
-	# Restoring cache
-	Restore_cache cache/packages_chroot
-
-	for HOOK in config/hooks/*.chroot
-	do
-		# Copying hook
-		cp "${HOOK}" chroot/root
-
-		# Making hook executable
-		if [ ! -x chroot/root/"$(basename ${HOOK})" ]
-		then
-			chmod +x chroot/root/"$(basename ${HOOK})"
-		fi
-
-		# Executing hook
-		Chroot chroot "/root/$(basename ${HOOK})" || { Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
-
-		# Removing hook
-		rm -f chroot/root/"$(basename ${HOOK})"
-	done
-
-	# Saving cache
-	Save_cache cache/packages_chroot
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_local-hooks
-fi
-- 
cgit v1.2.3