Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] gummiboot: split *.efi.stub into subpackage
@ 2021-07-10  1:18 jirutka
  2021-07-12  6:19 ` ericonr
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: jirutka @ 2021-07-10  1:18 UTC (permalink / raw)
  To: ml

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

There is a new pull request by jirutka against master on the void-packages repository

https://github.com/jirutka/void-packages gummiboot-efistub
https://github.com/void-linux/void-packages/pull/31878

gummiboot: split *.efi.stub into subpackage
Gummiboot bootloader is dead for a long time, but UEFI stub from this
project are still useful and being used. For example, mkinitcpio v31
will support UEFI executable generation by utilizing UEFI stub from
systemd or gummiboot (actually, it's the same stub because systemd has
absorbed gummiboot).

<!-- Mark items with [x] where applicable -->

#### 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/31878.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gummiboot-efistub-31878.patch --]
[-- Type: text/x-diff, Size: 1767 bytes --]

From fe27d632f393ff903027e89126d516aa5efce1af Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 10 Jul 2021 03:11:18 +0200
Subject: [PATCH] gummiboot: split *.efi.stub into subpackage

Gummiboot bootloader is dead for a long time, but UEFI stub from this
project are still useful and being used. For example, mkinitcpio v31
will support UEFI executable generation by utilizing UEFI stub from
systemd or gummiboot (actually, it's the same stub because systemd has
absorbed gummiboot).
---
 srcpkgs/gummiboot-efistub  |  1 +
 srcpkgs/gummiboot/template | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/gummiboot-efistub

diff --git a/srcpkgs/gummiboot-efistub b/srcpkgs/gummiboot-efistub
new file mode 120000
index 000000000000..9d6464eecfc3
--- /dev/null
+++ b/srcpkgs/gummiboot-efistub
@@ -0,0 +1 @@
+gummiboot
\ No newline at end of file
diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template
index 68e6f5be926c..5c33a93b280a 100644
--- a/srcpkgs/gummiboot/template
+++ b/srcpkgs/gummiboot/template
@@ -1,10 +1,11 @@
 # Template file for 'gummiboot'
 pkgname=gummiboot
 version=48.1
-revision=7
+revision=8
 archs="i686* x86_64* aarch64*"
 build_style=gnu-configure
 conf_files="/etc/default/gummiboot"
+depends="${pkgname}-efistub>=${version}_${revision}"
 hostmakedepends="automake pkg-config libxslt docbook-xsl"
 makedepends="gnu-efi-libs liblzma-devel libblkid-devel"
 short_desc="Simple UEFI Boot Manager"
@@ -34,3 +35,11 @@ post_install() {
 	vinstall ${FILESDIR}/kernel.d/gummiboot.confd 644 \
 		etc/default gummiboot
 }
+
+gummiboot-efistub_package() {
+	short_desc="Linux EFI stub from gummiboot project"
+
+	pkg_install() {
+		vmove usr/lib/gummiboot/*.efi.stub
+	}
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: gummiboot: split *.efi.stub into subpackage
  2021-07-10  1:18 [PR PATCH] gummiboot: split *.efi.stub into subpackage jirutka
@ 2021-07-12  6:19 ` ericonr
  2021-07-12 10:27 ` jirutka
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-07-12  6:19 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31878#issuecomment-878004867

Comment:
Why would someone not want the full package?

And if we want to merge this PR, it should also include a fix to `dracut-uefi` to depend on the new subpackage.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: gummiboot: split *.efi.stub into subpackage
  2021-07-10  1:18 [PR PATCH] gummiboot: split *.efi.stub into subpackage jirutka
  2021-07-12  6:19 ` ericonr
@ 2021-07-12 10:27 ` jirutka
  2021-07-12 10:38 ` [PR PATCH] [Updated] " jirutka
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: jirutka @ 2021-07-12 10:27 UTC (permalink / raw)
  To: ml

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

New comment by jirutka on void-packages repository

https://github.com/void-linux/void-packages/pull/31878#issuecomment-878162363

Comment:
> Why would someone not want the full package?

Because you don’t need any bootloader to boot Linux from UEFI. However, to fully utilize SecureBoot, it’s needed to bundle Linux kernel and initramdisk into a single UEFI executable; there’s where `*.efi.stub` file from the gummiboot package is needed (and only the efi stub, not the gummiboot bootloader).

> And if we want to merge this PR, it should also include a fix to dracut-uefi to depend on the new subpackage.

Yeah, you’re right, I’m gonna added it now.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] gummiboot: split *.efi.stub into subpackage
  2021-07-10  1:18 [PR PATCH] gummiboot: split *.efi.stub into subpackage jirutka
  2021-07-12  6:19 ` ericonr
  2021-07-12 10:27 ` jirutka
@ 2021-07-12 10:38 ` jirutka
  2021-07-12 10:39 ` jirutka
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: jirutka @ 2021-07-12 10:38 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by jirutka against master on the void-packages repository

https://github.com/jirutka/void-packages gummiboot-efistub
https://github.com/void-linux/void-packages/pull/31878

gummiboot: split *.efi.stub into subpackage
Gummiboot bootloader is dead for a long time, but UEFI stubs from this project are still useful and being used. For example, mkinitcpio v31 will support UEFI executable generation by utilizing UEFI stub from systemd or gummiboot (actually, it's the same stub because systemd has absorbed gummiboot). For this case, only the UEFI stub is needed, nothing else from gummiboot.

<!-- Mark items with [x] where applicable -->

#### 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/31878.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gummiboot-efistub-31878.patch --]
[-- Type: text/x-diff, Size: 2862 bytes --]

From c6e2c7d4e814610aa70df68a70e9c829e0ac793e Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 10 Jul 2021 03:11:18 +0200
Subject: [PATCH 1/2] gummiboot: split *.efi.stub into subpackage

dracut-uefi and mkinitcpio (since upcoming v31) needs UEFI stub from
gummiboot (or systemd, which is the same; systemd has absorbed
gummiboot) to bundle Linux kernel and initramdisk into a UEFI executable
- and only the stub, not gummiboot bootloader itself, nor any hooks.
---
 srcpkgs/gummiboot-efistub  |  1 +
 srcpkgs/gummiboot/template | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/gummiboot-efistub

diff --git a/srcpkgs/gummiboot-efistub b/srcpkgs/gummiboot-efistub
new file mode 120000
index 000000000000..9d6464eecfc3
--- /dev/null
+++ b/srcpkgs/gummiboot-efistub
@@ -0,0 +1 @@
+gummiboot
\ No newline at end of file
diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template
index 68e6f5be926c..3f0b0be347f0 100644
--- a/srcpkgs/gummiboot/template
+++ b/srcpkgs/gummiboot/template
@@ -1,12 +1,13 @@
 # Template file for 'gummiboot'
 pkgname=gummiboot
 version=48.1
-revision=7
+revision=8
 archs="i686* x86_64* aarch64*"
 build_style=gnu-configure
 conf_files="/etc/default/gummiboot"
 hostmakedepends="automake pkg-config libxslt docbook-xsl"
 makedepends="gnu-efi-libs liblzma-devel libblkid-devel"
+depends="${pkgname}-efistub>=${version}_${revision}"
 short_desc="Simple UEFI Boot Manager"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.0-or-later"
@@ -34,3 +35,11 @@ post_install() {
 	vinstall ${FILESDIR}/kernel.d/gummiboot.confd 644 \
 		etc/default gummiboot
 }
+
+gummiboot-efistub_package() {
+	short_desc="Linux EFI stub from gummiboot project"
+
+	pkg_install() {
+		vmove usr/lib/gummiboot/*.efi.stub
+	}
+}

From 7ecb9e79c3dc69e653f3b7da42b08fcf87efb9bc Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 12 Jul 2021 12:35:01 +0200
Subject: [PATCH 2/2] dracut-uefi: replace gummiboot with gummiboot-efistub

dracut-uefi needs only UEFI stub file from gummiboot.
---
 srcpkgs/dracut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index c8db2195c8a0..d3b6c6616722 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=053
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -55,7 +55,7 @@ dracut-network_package() {
 }
 
 dracut-uefi_package() {
-	depends="binutils gummiboot ${sourcepkg}>=${version}_${revision}"
+	depends="binutils gummiboot-efistub ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - UEFI bundle hook"
 	conf_files="/etc/default/dracut-uefi-hook"
 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: gummiboot: split *.efi.stub into subpackage
  2021-07-10  1:18 [PR PATCH] gummiboot: split *.efi.stub into subpackage jirutka
                   ` (2 preceding siblings ...)
  2021-07-12 10:38 ` [PR PATCH] [Updated] " jirutka
@ 2021-07-12 10:39 ` jirutka
  2021-07-12 10:40 ` [PR PATCH] [Updated] " jirutka
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: jirutka @ 2021-07-12 10:39 UTC (permalink / raw)
  To: ml

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

New comment by jirutka on void-packages repository

https://github.com/void-linux/void-packages/pull/31878#issuecomment-878169959

Comment:
Pushed and I also updated the commit/PR description to make it more clear.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] gummiboot: split *.efi.stub into subpackage
  2021-07-10  1:18 [PR PATCH] gummiboot: split *.efi.stub into subpackage jirutka
                   ` (3 preceding siblings ...)
  2021-07-12 10:39 ` jirutka
@ 2021-07-12 10:40 ` jirutka
  2021-07-14 14:46 ` [PR REVIEW] " ericonr
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: jirutka @ 2021-07-12 10:40 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by jirutka against master on the void-packages repository

https://github.com/jirutka/void-packages gummiboot-efistub
https://github.com/void-linux/void-packages/pull/31878

gummiboot: split *.efi.stub into subpackage
dracut-uefi and mkinitcpio (since upcoming v31) needs UEFI stub from gummiboot (or systemd, which is the same; systemd has absorbed gummiboot) to bundle Linux kernel and initramdisk into a UEFI executable - and only the stub, not gummiboot bootloader itself, nor any hooks.

<!-- Mark items with [x] where applicable -->

#### 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/31878.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gummiboot-efistub-31878.patch --]
[-- Type: text/x-diff, Size: 2867 bytes --]

From 7834efa13b7b3ce1b45c617f8a290900ebf83dc0 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 10 Jul 2021 03:11:18 +0200
Subject: [PATCH 1/2] gummiboot: split *.efi.stub into subpackage

dracut-uefi and mkinitcpio (since upcoming v31) needs UEFI stub from
gummiboot (or systemd, which is the same; systemd has absorbed
gummiboot) to bundle Linux kernel and initramdisk into a UEFI executable
- and only the stub, not gummiboot bootloader itself, nor any hooks.
---
 srcpkgs/gummiboot-efistub  |  1 +
 srcpkgs/gummiboot/template | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/gummiboot-efistub

diff --git a/srcpkgs/gummiboot-efistub b/srcpkgs/gummiboot-efistub
new file mode 120000
index 000000000000..9d6464eecfc3
--- /dev/null
+++ b/srcpkgs/gummiboot-efistub
@@ -0,0 +1 @@
+gummiboot
\ No newline at end of file
diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template
index 68e6f5be926c..5e84c92a90cf 100644
--- a/srcpkgs/gummiboot/template
+++ b/srcpkgs/gummiboot/template
@@ -1,12 +1,13 @@
 # Template file for 'gummiboot'
 pkgname=gummiboot
 version=48.1
-revision=7
+revision=8
 archs="i686* x86_64* aarch64*"
 build_style=gnu-configure
 conf_files="/etc/default/gummiboot"
 hostmakedepends="automake pkg-config libxslt docbook-xsl"
 makedepends="gnu-efi-libs liblzma-devel libblkid-devel"
+depends="${pkgname}-efistub>=${version}_${revision}"
 short_desc="Simple UEFI Boot Manager"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.0-or-later"
@@ -34,3 +35,11 @@ post_install() {
 	vinstall ${FILESDIR}/kernel.d/gummiboot.confd 644 \
 		etc/default gummiboot
 }
+
+gummiboot-efistub_package() {
+	short_desc="Linux UEFI stub from the gummiboot project"
+
+	pkg_install() {
+		vmove usr/lib/gummiboot/*.efi.stub
+	}
+}

From 2bf5af8e039179d6ebfdc13210dd5640c99339aa Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 12 Jul 2021 12:35:01 +0200
Subject: [PATCH 2/2] dracut-uefi: replace gummiboot with gummiboot-efistub

dracut-uefi needs only UEFI stub file from gummiboot.
---
 srcpkgs/dracut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index c8db2195c8a0..d3b6c6616722 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=053
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -55,7 +55,7 @@ dracut-network_package() {
 }
 
 dracut-uefi_package() {
-	depends="binutils gummiboot ${sourcepkg}>=${version}_${revision}"
+	depends="binutils gummiboot-efistub ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - UEFI bundle hook"
 	conf_files="/etc/default/dracut-uefi-hook"
 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR REVIEW] gummiboot: split *.efi.stub into subpackage
  2021-07-10  1:18 [PR PATCH] gummiboot: split *.efi.stub into subpackage jirutka
                   ` (4 preceding siblings ...)
  2021-07-12 10:40 ` [PR PATCH] [Updated] " jirutka
@ 2021-07-14 14:46 ` ericonr
  2021-07-14 14:51 ` [PR PATCH] [Updated] " jirutka
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-07-14 14:46 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31878#discussion_r669684833

Comment:
```suggestion
		vmove "usr/lib/gummiboot/*.efi.stub"
```

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] gummiboot: split *.efi.stub into subpackage
  2021-07-10  1:18 [PR PATCH] gummiboot: split *.efi.stub into subpackage jirutka
                   ` (5 preceding siblings ...)
  2021-07-14 14:46 ` [PR REVIEW] " ericonr
@ 2021-07-14 14:51 ` jirutka
  2021-07-14 14:51 ` [PR REVIEW] " jirutka
  2021-07-14 14:59 ` [PR PATCH] [Merged]: " ericonr
  8 siblings, 0 replies; 10+ messages in thread
From: jirutka @ 2021-07-14 14:51 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by jirutka against master on the void-packages repository

https://github.com/jirutka/void-packages gummiboot-efistub
https://github.com/void-linux/void-packages/pull/31878

gummiboot: split *.efi.stub into subpackage
dracut-uefi and mkinitcpio (since upcoming v31) needs UEFI stub from gummiboot (or systemd, which is the same; systemd has absorbed gummiboot) to bundle Linux kernel and initramdisk into a UEFI executable - and only the stub, not gummiboot bootloader itself, nor any hooks.

<!-- Mark items with [x] where applicable -->

#### 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/31878.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gummiboot-efistub-31878.patch --]
[-- Type: text/x-diff, Size: 2869 bytes --]

From db4ff6b48a8bebcf5599c2fcba0f094461c02027 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 10 Jul 2021 03:11:18 +0200
Subject: [PATCH 1/2] gummiboot: split *.efi.stub into subpackage

dracut-uefi and mkinitcpio (since upcoming v31) needs UEFI stub from
gummiboot (or systemd, which is the same; systemd has absorbed
gummiboot) to bundle Linux kernel and initramdisk into a UEFI executable
- and only the stub, not gummiboot bootloader itself, nor any hooks.
---
 srcpkgs/gummiboot-efistub  |  1 +
 srcpkgs/gummiboot/template | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/gummiboot-efistub

diff --git a/srcpkgs/gummiboot-efistub b/srcpkgs/gummiboot-efistub
new file mode 120000
index 000000000000..9d6464eecfc3
--- /dev/null
+++ b/srcpkgs/gummiboot-efistub
@@ -0,0 +1 @@
+gummiboot
\ No newline at end of file
diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template
index 68e6f5be926c..6ab40528e75e 100644
--- a/srcpkgs/gummiboot/template
+++ b/srcpkgs/gummiboot/template
@@ -1,12 +1,13 @@
 # Template file for 'gummiboot'
 pkgname=gummiboot
 version=48.1
-revision=7
+revision=8
 archs="i686* x86_64* aarch64*"
 build_style=gnu-configure
 conf_files="/etc/default/gummiboot"
 hostmakedepends="automake pkg-config libxslt docbook-xsl"
 makedepends="gnu-efi-libs liblzma-devel libblkid-devel"
+depends="${pkgname}-efistub>=${version}_${revision}"
 short_desc="Simple UEFI Boot Manager"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.0-or-later"
@@ -34,3 +35,11 @@ post_install() {
 	vinstall ${FILESDIR}/kernel.d/gummiboot.confd 644 \
 		etc/default gummiboot
 }
+
+gummiboot-efistub_package() {
+	short_desc="Linux UEFI stub from the gummiboot project"
+
+	pkg_install() {
+		vmove "usr/lib/gummiboot/*.efi.stub"
+	}
+}

From f8ba45a87f8d950f2f181f796a3357a77bedd07f Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 12 Jul 2021 12:35:01 +0200
Subject: [PATCH 2/2] dracut-uefi: replace gummiboot with gummiboot-efistub

dracut-uefi needs only UEFI stub file from gummiboot.
---
 srcpkgs/dracut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index c8db2195c8a0..d3b6c6616722 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=053
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -55,7 +55,7 @@ dracut-network_package() {
 }
 
 dracut-uefi_package() {
-	depends="binutils gummiboot ${sourcepkg}>=${version}_${revision}"
+	depends="binutils gummiboot-efistub ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - UEFI bundle hook"
 	conf_files="/etc/default/dracut-uefi-hook"
 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR REVIEW] gummiboot: split *.efi.stub into subpackage
  2021-07-10  1:18 [PR PATCH] gummiboot: split *.efi.stub into subpackage jirutka
                   ` (6 preceding siblings ...)
  2021-07-14 14:51 ` [PR PATCH] [Updated] " jirutka
@ 2021-07-14 14:51 ` jirutka
  2021-07-14 14:59 ` [PR PATCH] [Merged]: " ericonr
  8 siblings, 0 replies; 10+ messages in thread
From: jirutka @ 2021-07-14 14:51 UTC (permalink / raw)
  To: ml

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

New review comment by jirutka on void-packages repository

https://github.com/void-linux/void-packages/pull/31878#discussion_r669690044

Comment:
Fixed.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Merged]: gummiboot: split *.efi.stub into subpackage
  2021-07-10  1:18 [PR PATCH] gummiboot: split *.efi.stub into subpackage jirutka
                   ` (7 preceding siblings ...)
  2021-07-14 14:51 ` [PR REVIEW] " jirutka
@ 2021-07-14 14:59 ` ericonr
  8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-07-14 14:59 UTC (permalink / raw)
  To: ml

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

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

gummiboot: split *.efi.stub into subpackage
https://github.com/void-linux/void-packages/pull/31878

Description:
dracut-uefi and mkinitcpio (since upcoming v31) needs UEFI stub from gummiboot (or systemd, which is the same; systemd has absorbed gummiboot) to bundle Linux kernel and initramdisk into a UEFI executable - and only the stub, not gummiboot bootloader itself, nor any hooks.

<!-- Mark items with [x] where applicable -->

#### 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
-->


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-07-14 14:59 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-10  1:18 [PR PATCH] gummiboot: split *.efi.stub into subpackage jirutka
2021-07-12  6:19 ` ericonr
2021-07-12 10:27 ` jirutka
2021-07-12 10:38 ` [PR PATCH] [Updated] " jirutka
2021-07-12 10:39 ` jirutka
2021-07-12 10:40 ` [PR PATCH] [Updated] " jirutka
2021-07-14 14:46 ` [PR REVIEW] " ericonr
2021-07-14 14:51 ` [PR PATCH] [Updated] " jirutka
2021-07-14 14:51 ` [PR REVIEW] " jirutka
2021-07-14 14:59 ` [PR PATCH] [Merged]: " ericonr

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).