From 93e2985473b4d59f9c27457bb6cf7232f93e0e33 Mon Sep 17 00:00:00 2001 From: me Date: Sun, 16 Jul 2017 21:32:25 -0700 Subject: [PATCH] Check grub on non-dpkg systems. Also makes checking for grub-mkrescure more in line with the check for xorriso. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 05f39ad..4c7106c 100644 --- a/Makefile +++ b/Makefile @@ -77,13 +77,13 @@ binutils_version_check: @echo "[binutils] checking that installed objcopy version is >= $(MIN_OBJCOPY_VERSION)" @if [ "$(HAVE_VALID_OBJCOPY)" != "y" ]; then echo "[binutils] error: a more up to date binutils installation is required" ; exit 1 ; fi -iso_prereq: xorriso_check grub-pc-bin_check +iso_prereq: xorriso_check grub-mkrescue_check xorriso_check: @if xorriso --version >/dev/null 2>&1; then exit 0; else echo "Install xorriso via 'sudo apt install xorriso'." ; exit 1 ; fi -grub-pc-bin_check: - @ if dpkg -l grub-pc-bin > /dev/null; then exit 0; else echo "Install package grub-pc-bin via 'sudo apt install grub-pc-bin'."; exit 1; fi +grub-mkrescue_check: + @if grub-mkrescue --version >/dev/null 2>&1; then exit 0; else echo "Install package grub-pc-bin via 'sudo apt install grub-pc-bin'."; exit 1; fi linker_script: @echo "[sed] extracting LMA and VMA from constants.inc"