Removing chroot_local-patches, too much overhead for just applying patches (notably, with -p1 enforced), hooks are more flexible anyway.

3 files changed, 1 insertions, 69 deletions

diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index 51d547d14..ada67c3fb 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -68,7 +68,6 @@ done
 
 lb chroot_live-packages ${*}
 lb chroot_includes ${*}
-lb chroot_local-patches ${*}
 lb chroot_hooks ${*}
 lb chroot_hacks ${*}
 lb chroot_interactive ${*}
diff --git a/scripts/build/lb_chroot_local-patches b/scripts/build/lb_chroot_local-patches
deleted file mode 100755
index 0a6a3f258..000000000
--- a/scripts/build/lb_chroot_local-patches
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-##
-## This program 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
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'apply local patches against 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 applying chroot local patches..."
-
-# Requiring stage file
-Require_stagefile .build/config .build/bootstrap
-
-# Checking stage file
-Check_stagefile .build/chroot_local-patches
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if Find_files config/chroot_local-patches/
-then
-	# Restoring cache
-	Restore_cache cache/packages.chroot
-
-	# Checking depends
-	Check_package chroot/usr/bin/patch patch
-
-	# Installing depends
-	Install_package
-
-	for PATCH in config/chroot_local-patches/*
-	do
-		Echo_message "Applying patch %s..." "${PATCH}"
-		Chroot chroot "patch -p1" < ${PATCH}
-	done
-
-	# Removing depends
-	Remove_package
-
-	# Saving cache
-	Save_cache cache/packages.chroot
-
-	# Creating stage file
-	Create_stagefile .build/chroot_local-patches
-fi
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 8ddd022cc..8dbd0b884 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -191,7 +191,7 @@ Local_arguments ()
 				Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 
 				# Dump contents of directories that contain text files
-				for DIRECTORY in config/package-lists config/chroot_apt config/chroot_local-patches config/preseed config/binary_rootfs
+				for DIRECTORY in config/package-lists config/chroot_apt config/preseed config/binary_rootfs
 				do
 					if Find_files "${DIRECTORY}"
 					then
@@ -1237,7 +1237,6 @@ mkdir -p config/archives
 mkdir -p config/chroot_apt
 mkdir -p config/hooks
 mkdir -p config/includes.chroot
-mkdir -p config/chroot_local-patches
 mkdir -p config/packages
 mkdir -p config/packages.chroot
 mkdir -p config/package-lists