From 657e81586a888a6945c2166b536e3a8a7d7a3eae Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Tue, 26 Sep 2017 19:42:07 -0300
Subject: [PATCH] efibootmgr: update to 15.

Closes: #7837 [via git-merge-pr]
---
 .../patches/efibootmgr_default_to_grub2.patch | 16 ++++------
 .../patches/gcc7-duplicate-const.patch        | 31 -------------------
 srcpkgs/efibootmgr/template                   | 15 ++++++---
 3 files changed, 17 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch

diff --git a/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch b/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
index c143293545f..4245c033312 100644
--- a/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
+++ b/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
@@ -1,23 +1,19 @@
---- src/efibootmgr.c	2016-09-27 23:00:36.000000000 +0200
-+++ src/efibootmgr.c	2017-02-18 03:38:27.121886861 +0100
-@@ -1199,8 +1199,8 @@
- 	printf("\t     --ip-port <local>,<remote>	set local and remote IP ports\n");
+--- src/efibootmgr.c
++++ src/efibootmgr.c
+@@ -1239,7 +1239,7 @@ usage()
  	printf("\t     --ip-origin { {dhcp|static} | { static|stateless|stateful} }\n");
  #endif
--	printf("\t-l | --loader name     (defaults to \\EFI\\redhat\\grub.efi)\n");
+ 	printf("\t-l | --loader name     (defaults to \""DEFAULT_LOADER"\")\n");
 -	printf("\t-L | --label label     Boot manager display label (defaults to \"Linux\")\n");
-+	printf("\t-l | --loader name     (defaults to \\EFI\\void\\grubx64.efi)\n");
 +	printf("\t-L | --label label     Boot manager display label (defaults to \"Void Linux (GRUB2)\")\n");
  	printf("\t-m | --mirror-below-4G t|f mirror memory below 4GB\n");
  	printf("\t-M | --mirror-above-4G X percentage memory to mirror above 4GB\n");
  	printf("\t-n | --bootnext XXXX   set BootNext to XXXX (hex)\n");
-@@ -1229,8 +1229,8 @@
- 	opts.active          = -1;   /* Don't set it */
+@@ -1269,7 +1269,7 @@ set_default_opts()
  	opts.timeout         = -1;   /* Don't set it */
  	opts.edd10_devicenum = 0x80;
--	opts.loader          = "\\EFI\\redhat\\grub.efi";
+ 	opts.loader          = DEFAULT_LOADER;
 -	opts.label           = (unsigned char *)"Linux";
-+	opts.loader          = "\\EFI\\void\\grubx64.efi";
 +	opts.label           = (unsigned char *)"Void Linux (GRUB2)";
  	opts.disk            = "/dev/sda";
  	opts.part            = 1;
diff --git a/srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch b/srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch
deleted file mode 100644
index cb222a2cec4..00000000000
--- a/srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/efibootdump.c	2016-09-27 23:00:36.000000000 +0200
-+++ src/efibootdump.c	2017-05-09 12:33:41.756321719 +0200
-@@ -39,7 +39,7 @@
- 	uint8_t *optional_data = NULL;
- 	size_t optional_data_len = 0;
- 	uint16_t pathlen;
--	const unsigned char const *desc;
-+	const unsigned char *desc;
- 	char *raw;
- 	size_t raw_len;
- 
---- src/efibootmgr.c	2017-05-09 12:32:45.939316598 +0200
-+++ src/efibootmgr.c	2017-05-09 12:34:02.281323682 +0200
-@@ -221,7 +221,7 @@
- 	list_t *pos;
- 	var_entry_t *entry;
- 	efi_load_option *load_option;
--	const unsigned char const *desc;
-+	const unsigned char *desc;
- 
- 	list_for_each(pos, var_list) {
- 		entry = list_entry(pos, var_entry_t, list);
-@@ -873,7 +873,7 @@
- {
- 	list_t *pos;
- 	var_entry_t *boot;
--	const unsigned char const *description;
-+	const unsigned char *description;
- 	efi_load_option *load_option;
- 	efidp dp = NULL;
- 	unsigned char *optional_data = NULL;
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index e3aed0c487d..a53a0cf6494 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -1,7 +1,7 @@
 # Template file for 'efibootmgr'
 pkgname=efibootmgr
-version=14
-revision=3
+version=15
+revision=1
 hostmakedepends="pkg-config"
 makedepends="libefivar-devel zlib-devel pciutils-devel"
 short_desc="Tool to modify UEFI Firmware Boot Manager Variables"
@@ -9,14 +9,21 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="https://github.com/rhinstaller/efibootmgr"
 distfiles="https://github.com/rhinstaller/efibootmgr/releases/download/${version}/${pkgname}-${version}.tar.bz2"
-checksum=377ec16484414b80afd1b8a586153d7ef55ccf048638080101d49b7c77f37ad8
+checksum=2081add77eb0641805386acd0a0fbbe6dbfb71831b814507ef49087f748333f9
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 conf_files="/etc/default/efibootmgr-kernel-hook"
 
 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/efivar"
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*)
+		EFI_LOADER="grubx64.efi" ;;
+	i686*)
+		EFI_LOADER="grub.efi" ;;
+esac
+
 do_build() {
-	make EXTRA_CFLAGS="$CFLAGS" ${makejobs}
+	make EXTRA_CFLAGS="$CFLAGS" ${makejobs} EFIDIR="void" EFI_LOADER="${EFI_LOADER}"
 }
 do_install() {
 	vbin src/efibootdump