]> git.proxmox.com Git - zfs-grub.git/commitdiff
Makefile target 'dinstall': do not install efi packages
authorDietmar Maurer <dietmar@proxmox.com>
Mon, 19 Jan 2015 12:06:15 +0000 (13:06 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Mon, 19 Jan 2015 12:06:15 +0000 (13:06 +0100)
Only install grub-efi-amd64-bin, which does not conflicht with pc
packages.

Makefile

index 63f5ae0b5e1b9ddbe9473b11cc1f0991e16aa6bf..21a63cd296e5b9df75bce6c0fa89de54302757e4 100644 (file)
--- 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}: