From 036b6161f250c0a798c987f0a6cf2ed9b987bd93 Mon Sep 17 00:00:00 2001
From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Mon, 28 Aug 2017 11:29:54 +0200
Subject: Check all dependencies independent of LB_BUILD_WITH_CHROOT

Since commit fdc9250bc (Changing package dependency checks within chroot
to work outside as well), Check_package automatically checks for
LB_BUILD_WITH_CHROOT and works inside as well as outside of the chroot,
so no need to check LB_BUILD_WITH_CHROOT before calling them.
Install_package and Remove_package are just a no-op when building
without chroot, so they can also be called unconditionally.
Restore_cache and Save_cache do not check LB_BUILD_WITH_CHROOT but it
it should not hurt to call them when not needed (which already happened
in some cases).

This commit makes all Check_package calls unconditional on
LB_BUILD_WITH_CHROOT.

For binary_syslinux, this fixes the check (which used outdated paths
outside the chroot since 7b6dfd9d1), for binary_grub-efi,
binary_package-lists and chroot_package-lists this simplifies the code
(but also causes the check to become package-based instead of file-based
on apt-based systems), and for binary_loadlin and binary_win32-loader
this adds the check outside the chroot which was previously missing.
---
 scripts/build/binary_package-lists | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

(limited to 'scripts/build/binary_package-lists')

diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index dcbadccb5..a13491ee3 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -55,23 +55,13 @@ if ls config/package-lists/*.list > /dev/null 2>&1 || \
 then
 	# Check depends
 	Check_package host /usr/bin/apt-ftparchive apt-utils
+	Check_package chroot /usr/bin/grep-aptavail dctrl-tools
 
-	case "${LB_BUILD_WITH_CHROOT}" in
-		true)
-			# Restoring cache
-			Restore_cache cache/packages.chroot
+	# Restoring cache
+	Restore_cache cache/packages.chroot
 
-			# Check depends
-			Check_package chroot /usr/bin/grep-aptavail dctrl-tools
-
-			# Installing depends
-			Install_package
-			;;
-
-		false)
-			Check_package host /usr/bin/grep-aptavail dctrl-tools
-			;;
-	esac
+	# Installing depends
+	Install_package
 
 	if [ -e "${LIVE_BUILD}/share/bin/Packages" ]
 	then
@@ -163,15 +153,11 @@ then
 	rm -rf chroot/binary.deb
 	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
 
-	case "${LB_BUILD_WITH_CHROOT}" in
-		true)
-			# Removing depends
-			Remove_package
+	# Removing depends
+	Remove_package
 
-			# Saving cache
-			Save_cache cache/packages.chroot
-			;;
-	esac
+	# Saving cache
+	Save_cache cache/packages.chroot
 
 	# Creating stage file
 	Create_stagefile .build/binary_package-lists
-- 
cgit v1.2.3