Added the option to include files before and after package installation

Moved includes.chroot to includes.chroot_after_packages and added
includes.chroot_before_packages. includes.chroot does still work as before.

We also now use rsync for copying files if it is installed.
This improves runtime and space consumption for large includes.

Gbp-Dch: Short
Closes: #927128

1 files changed, 45 insertions, 0 deletions

diff --git a/scripts/build/chroot_includes_after_packages b/scripts/build/chroot_includes_after_packages
new file mode 100755
index 000000000..f4ca0bb2c
--- /dev/null
+++ b/scripts/build/chroot_includes_after_packages
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2016-2020 The Debian Live team
+## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
+##
+## 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
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
+
+# Setting static variables
+DESCRIPTION="Copy files into chroot after packages have been installed"
+USAGE="${PROGRAM} [--force]"
+
+# Processing arguments and configuration files
+Init_config_data "${@}"
+
+Echo_message "Begin copying chroot includes after packages have been installed..."
+
+# Requiring stage file
+Require_stagefiles config bootstrap
+
+# Checking stage file
+Check_stagefile
+
+# Acquire lock file
+Acquire_lockfile
+
+# Handleling backwards compatibility
+INCLUDE_DIR=$(select_includes_chroot)
+
+if [ -n "${INCLUDE_DIR}" ]
+then
+	# Copying includes into chroot
+	Chroot_copy_dir config/"${INCLUDE_DIR}"/
+fi
+
+# Creating stage file
+Create_stagefile