From 9077289332d1c22b4f2533d38eb1aadc0c793c9e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
Date: Tue, 20 Nov 2018 17:35:04 +0100
Subject: [PATCH] Add includes by pass

lb_chroot_includes now takes the name of the pass as first argument and
will includes files for the corresponding pass from the directory
include.chroot.<pass>
---
 live-build/lb_chroot_layered | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/live-build/lb_chroot_layered b/live-build/lb_chroot_layered
index fc3dc275..8a064960 100755
--- a/live-build/lb_chroot_layered
+++ b/live-build/lb_chroot_layered
@@ -93,6 +93,19 @@ lb_chroot_install_snaps() {
 	done < $snaplist_file
 }
 
+lb_chroot_includes() {
+	# Copying includes from pass subdirectory
+	local pass="$1"
+
+	if [ ! -d config/includes.chroot.${pass} ]; then
+		return
+	fi
+
+	cd config/includes.chroot.${pass}
+	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/chroot
+	cd "${OLDPWD}"
+}
+
 create_chroot_pass() {
 	local pass=$1
 	local prevpass=$2
@@ -158,7 +171,9 @@ create_chroot_pass() {
 		lb chroot_live-packages ${*}
 	fi
 
-	lb chroot_includes ${*}
+	# Run includes by pass
+	lb_chroot_includes ${pass} ${*}
+
 	lb chroot_hooks ${*}
 	lb chroot_hacks ${*}
 	lb chroot_interactive ${*}