wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 15:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

efibootmgr: update to 18.

Browse source
This commit is contained in:
André Cerqueira 2022-07-28 21:46:54 +01:00 • committed by classabbyamp
parent b86d0a0048
commit 72aed002b8
3 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
View file

@ -1,20 +1,34 @@
From 2af29c3dfba668f341b007261954a829ec148f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 28 Jul 2022 21:42:22 +0100
Subject: [PATCH 1/1] efibootmgr_default_to_grub2
---
src/efibootmgr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/efibootmgr.c b/src/efibootmgr.c
index b980bcd..c9ff07b 100644
--- a/src/efibootmgr.c --- a/src/efibootmgr.c
+++ b/src/efibootmgr.c +++ b/src/efibootmgr.c
@@ -1239,7 +1239,7 @@ usage() @@ -1412,7 +1412,7 @@ usage()
printf("\t --ip-origin { {dhcp|static} | { static|stateless|stateful} }\n"); printf("\t-i | --iface name Create a netboot entry for the named interface.\n");
#endif printf("\t-I | --index number When creating an entry, insert it in bootorder at specified position (default: 0).\n");
printf("\t-l | --loader name (defaults to \""DEFAULT_LOADER"\")\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 | --label label Boot manager display label (defaults to \"Linux\").\n");
+ printf("\t-L | --label label Boot manager display label (defaults to \"Void Linux (GRUB2)\")\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-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-M | --mirror-above-4G X Percentage memory to mirror above 4GB.\n");
printf("\t-n | --bootnext XXXX set BootNext to XXXX (hex)\n"); printf("\t-n | --bootnext XXXX Set BootNext to XXXX (hex).\n");
@@ -1269,7 +1269,7 @@ set_default_opts() @@ -1444,7 +1444,7 @@ set_default_opts()
opts.timeout = -1; /* Don't set it */ opts.timeout = -1; /* Don't set it */
opts.edd10_devicenum = 0x80; opts.edd10_devicenum = 0x80;
opts.loader = DEFAULT_LOADER; opts.loader = DEFAULT_LOADER;
- opts.label = (unsigned char *)"Linux"; - opts.label = (unsigned char *)"Linux";
+ opts.label = (unsigned char *)"Void Linux (GRUB2)"; + opts.label = (unsigned char *)"Void Linux (GRUB2)";
opts.disk = "/dev/sda"; opts.disk = "/dev/sda";
opts.part = 1; opts.part = -1;
} }
--
2.37.1

12
srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch
View file

@ -1,12 +0,0 @@
--- a/src/efibootmgr.c 2019-01-16 16:38:24.694719888 +0100
+++ b/src/efibootmgr.c 2019-01-16 16:39:35.773715651 +0100
@@ -1536,9 +1536,6 @@
"invalid numeric value %s\n",
optarg);
}
- /* XXX efivar-36 accidentally doesn't have a public
- * header for this */
- extern int efi_set_verbose(int verbosity, FILE *errlog);
efi_set_verbose(opts.verbose - 2, stderr);
break;
case 'V':

15
srcpkgs/efibootmgr/template
View file

@ -1,16 +1,15 @@
# Template file for 'efibootmgr' # Template file for 'efibootmgr'
pkgname=efibootmgr pkgname=efibootmgr
version=17 version=18
revision=6 revision=1
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="libefivar-devel popt-devel" makedepends="libefivar-devel popt-devel"
short_desc="Tool to modify UEFI Firmware Boot Manager Variables" short_desc="Tool to modify UEFI Firmware Boot Manager Variables"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="André Cerqueira <acerqueira021@gmail.com>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://github.com/rhinstaller/efibootmgr" homepage="https://github.com/rhboot/efibootmgr"
distfiles="https://github.com/rhinstaller/efibootmgr/releases/download/${version}/${pkgname}-${version}.tar.bz2"
distfiles="https://github.com/rhboot/efibootmgr/archive/${version}.tar.gz" distfiles="https://github.com/rhboot/efibootmgr/archive/${version}.tar.gz"
checksum=22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d checksum=442867d12f8525034a404fc8af3036dba8e1fc970998af2486c3b940dfad0874
conf_files="/etc/default/efibootmgr-kernel-hook" conf_files="/etc/default/efibootmgr-kernel-hook"
@ -27,6 +26,10 @@ case "$XBPS_TARGET_MACHINE" in
broken="unsupported UEFI for architecture ${XBPS_TARGET_MACHINE}" ;; broken="unsupported UEFI for architecture ${XBPS_TARGET_MACHINE}" ;;
esac esac
do_configure() {
sed -i 's/-Werror //' Make.defaults
}
do_build() { do_build() {
make EXTRA_CFLAGS="$CFLAGS" ${makejobs} EFIDIR="void" EFI_LOADER="${EFI_LOADER}" make EXTRA_CFLAGS="$CFLAGS" ${makejobs} EFIDIR="void" EFI_LOADER="${EFI_LOADER}"
} }