From 18bf308be07c6a3be3f32bc704d23396f89f683b Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Wed, 30 Jun 2021 17:10:51 +1200
Subject: [PATCH] go back to only running 'lb chroot_archives' on root layers

but still run configure_universe after archive removal, not before
---
 live-build/lb_chroot_layered | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/live-build/lb_chroot_layered b/live-build/lb_chroot_layered
index 3fe761cf..c08a43ef 100755
--- a/live-build/lb_chroot_layered
+++ b/live-build/lb_chroot_layered
@@ -191,7 +191,12 @@ create_chroot_pass () {
 	lb chroot_resolv install ${*}
 	lb chroot_hostname install ${*}
 	lb chroot_apt install ${*}
-	lb chroot_archives chroot install ${*}
+	# Note: this triggers an upgrade + dist-ugprade; which may impact sublayers with more
+	# diff content than desired. So only running this on root pass.
+	# Only configure universe on root passes
+	if $(is_root_layer $pass); then
+		lb chroot_archives chroot install ${*}
+	fi
 
 	# Customizing chroot
 	lb chroot_linux-image ${*}
@@ -269,8 +274,11 @@ create_chroot_pass () {
 
 	Chroot chroot "dpkg-query -W" > chroot.packages.${pass}
 
-	lb chroot_archives chroot remove ${*}
-	configure_universe
+	# Deconfiguring chroot
+	if $(is_root_layer $pass); then
+		lb chroot_archives chroot remove ${*}
+		configure_universe
+	fi
 	lb chroot_apt remove ${*}
 	lb chroot_hostname remove ${*}
 	lb chroot_resolv remove ${*}