From: m3tav3rse <m3tav3rse@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] efibootmgr: fix post-remove kernel hook
Date: Sun, 14 Mar 2021 20:36:39 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29464@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1712 bytes --]
There is a new pull request by m3tav3rse against master on the void-packages repository
https://github.com/m3tav3rse/void-packages efibootmgr-hokfix
https://github.com/void-linux/void-packages/pull/29464
efibootmgr: fix post-remove kernel hook
Don't attempt to delete nonexistent UEFI entries from previous kernel versions.
Fixes #13133
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [*] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29464.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-efibootmgr-hokfix-29464.patch --]
[-- Type: text/x-diff, Size: 1428 bytes --]
From 8615006af90ea82fe23cf7113fb0c71fd7b858e6 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Sun, 14 Mar 2021 20:22:52 +0100
Subject: [PATCH] efibootmgr: fix post-remove kernel hook
Don't attempt to delete nonexistent UEFI entries from previous kernel versions.
Fixes #13133
---
srcpkgs/efibootmgr/files/kernel.d/efibootmgr.post-remove | 2 +-
srcpkgs/efibootmgr/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/efibootmgr/files/kernel.d/efibootmgr.post-remove b/srcpkgs/efibootmgr/files/kernel.d/efibootmgr.post-remove
index 310f4e820626..54557e5cb792 100644
--- a/srcpkgs/efibootmgr/files/kernel.d/efibootmgr.post-remove
+++ b/srcpkgs/efibootmgr/files/kernel.d/efibootmgr.post-remove
@@ -18,4 +18,4 @@ major_version=$(echo $PKGNAME | cut -c 6-)
hexnum=$(efibootmgr | grep "Void Linux with kernel ${major_version}" | cut -c "5-8")
# delete it
-efibootmgr -Bq -b $hexnum
+[ "$hexnum" ] && efibootmgr -Bq -b $hexnum
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index 36a0b6f6bb9d..bd2e88bbbeac 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -1,7 +1,7 @@
# Template file for 'efibootmgr'
pkgname=efibootmgr
version=17
-revision=5
+revision=6
hostmakedepends="pkg-config"
makedepends="libefivar-devel popt-devel"
short_desc="Tool to modify UEFI Firmware Boot Manager Variables"
next reply other threads:[~2021-03-14 19:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-14 19:36 m3tav3rse [this message]
2021-03-17 13:55 ` [PR PATCH] [Merged]: " ericonr
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-29464@inbox.vuxu.org \
--to=m3tav3rse@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).