From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 19 Jan 2015 12:06:15 +0000 (+0100)
Subject: Makefile target 'dinstall': do not install efi packages
X-Git-Url: https://git.proxmox.com/?p=zfs-grub.git;a=commitdiff_plain;h=794dd08844f4000e0298d3a057be807ff26d88fc

Makefile target 'dinstall': do not install efi packages

Only install grub-efi-amd64-bin, which does not conflicht with pc
packages.
---

diff --git a/Makefile b/Makefile
index 63f5ae0..21a63cd 100644
--- a/Makefile
+++ b/Makefile
@@ -7,20 +7,25 @@ GRUB_DEB_SRC=grub2_2.02~beta2-19.debian.tar.xz
 # update/sync changelog.pve
 DEBVER=2.02~bpo70+2
 
-DEBS=						\
+PC_DEBS=					\
 grub2-common_${DEBVER}_amd64.deb		\
-grub-common_${DEBVER}_amd64.deb		\
-grub-efi_${DEBVER}_amd64.deb		\
-grub-efi-amd64_${DEBVER}_amd64.deb		\
-grub-efi-amd64-bin_${DEBVER}_amd64.deb	\
-grub-efi-ia32_${DEBVER}_amd64.deb		\
-grub-efi-ia32-bin_${DEBVER}_amd64.deb	\
+grub-common_${DEBVER}_amd64.deb			\
+grub-efi-amd64-bin_${DEBVER}_amd64.deb		\
 grub-pc_${DEBVER}_amd64.deb			\
-grub-pc-bin_${DEBVER}_amd64.deb		\
-grub-pc-dbg_${DEBVER}_amd64.deb		\
+grub-pc-bin_${DEBVER}_amd64.deb			\
+grub-pc-dbg_${DEBVER}_amd64.deb			\
 grub-rescue-pc_${DEBVER}_amd64.deb		\
 grub-theme-starfield_${DEBVER}_amd64.deb
 
+EFI_DEBS=					\
+grub-efi_${DEBVER}_amd64.deb			\
+grub-efi-amd64_${DEBVER}_amd64.deb		\
+grub-efi-ia32_${DEBVER}_amd64.deb		\
+grub-efi-ia32-bin_${DEBVER}_amd64.deb		\
+
+DEBS=${PC_DEBS} ${EFI_DEBS}
+
+
 #grub2_${DEBVER}_amd64.deb
 #grub-coreboot_${DEBVER}_amd64.deb
 #grub-coreboot-bin_${DEBVER}_amd64.deb
@@ -40,7 +45,7 @@ all: ${DEBS}
 
 .PHONY: dinstall
 dinstall: ${DEBS}
-	dpkg -i ${DEBS}
+	dpkg -i ${PC_DEBS}
 
 .PHONY: grub
 grub ${DEBS}: