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_syslinux | 41 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

(limited to 'scripts/build/binary_syslinux')

diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 1347aa20b..bb6658826 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -114,42 +114,13 @@ else
 fi
 
 # Checking depends
-case "${LB_BUILD_WITH_CHROOT}" in
-	true)
-		Check_package chroot /usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
-		Check_package chroot /usr/lib/syslinux syslinux-common
-
-		if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
-		then
-			Check_package chroot /usr/bin/rsvg-convert librsvg2-bin
-		fi
-		;;
+Check_package chroot /usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
+Check_package chroot /usr/lib/syslinux syslinux-common
 
-	false)
-		if [ ! -e "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" ]
-		then
-			Echo_error "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])"
-			exit 1
-		fi
-
-		if [ ! -e /usr/lib/syslinux ]
-		then
-			# syslinux-common
-			Echo_error "/usr/lib/syslinux - no such directory"
-			exit 1
-		fi
-
-		if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
-		then
-			if [ ! -e /usr/bin/rsvg-convert ]
-			then
-				# librsvg2-bin
-				Echo_error "/usr/bin/rsvg-convert - no such file"
-				exit 1
-			fi
-		fi
-		;;
-esac
+if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
+then
+	Check_package chroot /usr/bin/rsvg-convert librsvg2-bin
+fi
 
 # Restoring cache
 Restore_cache cache/packages.binary
-- 
cgit v1.2.3