From: motorto <motorto@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] efibootmgr: update to 18.
Date: Thu, 28 Jul 2022 22:48:33 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38346@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 667 bytes --]
There is a new pull request by motorto against master on the void-packages repository
https://github.com/motorto/void-packages efibootmgr-18
https://github.com/void-linux/void-packages/pull/38346
efibootmgr: update to 18.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l
A patch file from https://github.com/void-linux/void-packages/pull/38346.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-efibootmgr-18-38346.patch --]
[-- Type: text/x-diff, Size: 5073 bytes --]
From e7bbc92a94ddbb6ee1d5008fcb194d54695633b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 28 Jul 2022 21:46:54 +0100
Subject: [PATCH] efibootmgr: update to 18.
---
.../patches/efibootmgr_default_to_grub2.patch | 34 +++++++++++++------
.../patches/efivar-efi_set_verbose.patch | 12 -------
srcpkgs/efibootmgr/template | 12 ++++---
3 files changed, 32 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch
diff --git a/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch b/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
index d4d6c8784807..d7090f5080c8 100644
--- a/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
+++ b/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
@@ -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
+++ b/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 \""DEFAULT_LOADER"\")\n");
-- printf("\t-L | --label label Boot manager display label (defaults to \"Linux\")\n");
+@@ -1412,7 +1412,7 @@ usage()
+ printf("\t-i | --iface name Create a netboot entry for the named interface.\n");
+ 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 | --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-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");
-@@ -1269,7 +1269,7 @@ set_default_opts()
+ 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");
+@@ -1444,7 +1444,7 @@ set_default_opts()
opts.timeout = -1; /* Don't set it */
opts.edd10_devicenum = 0x80;
opts.loader = DEFAULT_LOADER;
- opts.label = (unsigned char *)"Linux";
+ opts.label = (unsigned char *)"Void Linux (GRUB2)";
opts.disk = "/dev/sda";
- opts.part = 1;
+ opts.part = -1;
}
+--
+2.37.1
+
diff --git a/srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch b/srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch
deleted file mode 100644
index 8b5eebdf8b6b..000000000000
--- a/srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch
+++ /dev/null
@@ -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':
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index bd2e88bbbeac..b191a23d38bf 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -1,16 +1,16 @@
# Template file for 'efibootmgr'
pkgname=efibootmgr
-version=17
-revision=6
+version=18
+revision=1
hostmakedepends="pkg-config"
makedepends="libefivar-devel popt-devel"
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"
homepage="https://github.com/rhinstaller/efibootmgr"
distfiles="https://github.com/rhinstaller/efibootmgr/releases/download/${version}/${pkgname}-${version}.tar.bz2"
distfiles="https://github.com/rhboot/efibootmgr/archive/${version}.tar.gz"
-checksum=22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d
+checksum=442867d12f8525034a404fc8af3036dba8e1fc970998af2486c3b940dfad0874
conf_files="/etc/default/efibootmgr-kernel-hook"
@@ -27,6 +27,10 @@ case "$XBPS_TARGET_MACHINE" in
broken="unsupported UEFI for architecture ${XBPS_TARGET_MACHINE}" ;;
esac
+do_configure() {
+ sed -i 's/-Werror //' Make.defaults
+}
+
do_build() {
make EXTRA_CFLAGS="$CFLAGS" ${makejobs} EFIDIR="void" EFI_LOADER="${EFI_LOADER}"
}
next reply other threads:[~2022-07-28 20:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-28 20:48 motorto [this message]
2022-07-29 6:44 ` [PR REVIEW] " classabbyamp
2022-07-29 6:59 ` motorto
2022-07-29 7:39 ` [PR PATCH] [Updated] " motorto
2022-07-29 7:46 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38346@inbox.vuxu.org \
--to=motorto@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).