[PR PATCH] efibootmgr: fix post-remove kernel hook

[PR PATCH] efibootmgr: fix post-remove kernel hook

[m3tav3rse]

[-- 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"

Re: [PR PATCH] [Merged]: efibootmgr: fix post-remove kernel hook

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]

There's a merged pull request on the void-packages repository

efibootmgr: fix post-remove kernel hook
https://github.com/void-linux/void-packages/pull/29464

Description:
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?
- [x] 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
-->