* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
@ 2023-03-09 0:28 ` classabbyamp
2023-03-09 0:29 ` classabbyamp
` (45 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-09 0:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 3180 bytes --]
From b3bec805b8d6ba1233211016ce593c4c9e897a63 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-253
---
srcpkgs/systemd-boot-efistub/template | 52 +++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/template
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 000000000000..9e9dc05917bf
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,52 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=253
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dgnu-efi=true -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dblkid=false -Dkernel-install=false
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2"
+makedepends="gnu-efi-libs libcap-devel libmount-devel"
+short_desc="Linux UEFI stub from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://systemd.io"
+#changelog=""
+distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
+checksum=acbd86d42ebc2b443722cb469ad215a140f504689c7a9133ecf91b235275a491
+
+# -Dtests=false
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ rv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+
+do_install() {
+ vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd-boot
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
2023-03-09 0:28 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-03-09 0:29 ` classabbyamp
2023-03-09 0:40 ` classabbyamp
` (44 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-09 0:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 3234 bytes --]
From 8dc851003755ea998e8169439fef91183c3db73d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-253
---
srcpkgs/systemd-boot-efistub/template | 53 +++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/template
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 000000000000..2329f7a09317
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,53 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=253
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dgnu-efi=true -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
+ -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dblkid=false -Dkernel-install=false
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2"
+makedepends="gnu-efi-libs libcap-devel libmount-devel"
+short_desc="Linux UEFI stub from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://systemd.io"
+#changelog=""
+distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
+checksum=acbd86d42ebc2b443722cb469ad215a140f504689c7a9133ecf91b235275a491
+
+# -Dtests=false
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ rv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+
+do_install() {
+ vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd-boot
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
2023-03-09 0:28 ` [PR PATCH] [Updated] " classabbyamp
2023-03-09 0:29 ` classabbyamp
@ 2023-03-09 0:40 ` classabbyamp
2023-03-09 0:46 ` classabbyamp
` (43 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-09 0:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 3276 bytes --]
From 8367023f5a85bfc65322e3d46dea031a2c79ed61 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-253
---
srcpkgs/systemd-boot-efistub/template | 54 +++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/template
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 000000000000..4d7f15b62f30
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,54 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=253
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dgnu-efi=true -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib
+ -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
+ -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dblkid=false -Dkernel-install=false
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2"
+makedepends="gnu-efi-libs libcap-devel libmount-devel"
+short_desc="Linux UEFI stub from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://systemd.io"
+#changelog=""
+distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
+checksum=acbd86d42ebc2b443722cb469ad215a140f504689c7a9133ecf91b235275a491
+
+# -Dtests=false
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ rv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+
+do_install() {
+ vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd-boot
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (2 preceding siblings ...)
2023-03-09 0:40 ` classabbyamp
@ 2023-03-09 0:46 ` classabbyamp
2023-03-09 0:58 ` classabbyamp
` (42 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-09 0:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 3242 bytes --]
From f207f2030295c359311954e221ed596f2123d6e1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-253
---
srcpkgs/systemd-boot-efistub/template | 51 +++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/template
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 000000000000..7dd4c2541632
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,51 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=253
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dgnu-efi=true -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib
+ -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
+ -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dblkid=false -Dkernel-install=false
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2"
+makedepends="gnu-efi-libs libcap-devel libmount-devel"
+short_desc="Linux UEFI stub from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://systemd.io"
+distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
+checksum=acbd86d42ebc2b443722cb469ad215a140f504689c7a9133ecf91b235275a491
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ rv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+
+do_install() {
+ vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd-boot
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (3 preceding siblings ...)
2023-03-09 0:46 ` classabbyamp
@ 2023-03-09 0:58 ` classabbyamp
2023-03-11 8:38 ` classabbyamp
` (41 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-09 0:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 3246 bytes --]
From 712bda014afa004901598f704a78df801fd2d3ec Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-253
---
srcpkgs/systemd-boot-efistub/template | 51 +++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/template
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 000000000000..49d503606ec6
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,51 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=253
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dgnu-efi=true -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib
+ -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
+ -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dblkid=false -Dkernel-install=false
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2"
+makedepends="gnu-efi-libs libcap-devel libmount-devel"
+short_desc="Linux UEFI stub from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://systemd.io"
+distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
+checksum=acbd86d42ebc2b443722cb469ad215a140f504689c7a9133ecf91b235275a491
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ rv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+
+do_install() {
+ vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd/boot/efi
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (4 preceding siblings ...)
2023-03-09 0:58 ` classabbyamp
@ 2023-03-11 8:38 ` classabbyamp
2023-03-11 19:26 ` classabbyamp
` (40 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-11 8:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 4159 bytes --]
From 5bdd46d9bc2928582ff52a906947f2daba62012a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-253
---
.../systemd-boot-efistub/patches/musl.patch | 23 +++++++++
srcpkgs/systemd-boot-efistub/template | 51 +++++++++++++++++++
2 files changed, 74 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/patches/musl.patch
create mode 100644 srcpkgs/systemd-boot-efistub/template
diff --git a/srcpkgs/systemd-boot-efistub/patches/musl.patch b/srcpkgs/systemd-boot-efistub/patches/musl.patch
new file mode 100644
index 000000000000..ecff9cab4b74
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/patches/musl.patch
@@ -0,0 +1,23 @@
+https://github.com/systemd/systemd/pull/26689#issuecomment-1456223365
+
+should be removable in the next version
+
+--- a/src/boot/efi/efi-string.c
++++ b/src/boot/efi/efi-string.c
+@@ -2,14 +2,15 @@
+
+ #include <stdbool.h>
+ #include <stdint.h>
+-#include <wchar.h>
+
+ #include "efi-string.h"
+
+ #if SD_BOOT
+ # include "missing_efi.h"
+ # include "util.h"
++typedef __WCHAR_TYPE__ wchar_t;
+ #else
++# include <wchar.h>
+ # include <stdlib.h>
+ # include "alloc-util.h"
+ # define xnew(t, n) ASSERT_SE_PTR(new(t, n))
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 000000000000..5461bfe889e7
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,51 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=253
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dgnu-efi=true -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib
+ -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
+ -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dblkid=false -Dkernel-install=false
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2"
+makedepends="gnu-efi-libs libcap-devel libmount-devel"
+short_desc="Linux UEFI stub from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://systemd.io"
+distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
+checksum=acbd86d42ebc2b443722cb469ad215a140f504689c7a9133ecf91b235275a491
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ riscv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+
+do_install() {
+ vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd/boot/efi
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (5 preceding siblings ...)
2023-03-11 8:38 ` classabbyamp
@ 2023-03-11 19:26 ` classabbyamp
2023-03-11 19:38 ` classabbyamp
` (39 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-11 19:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 3246 bytes --]
From 4e91756c62dd72b32869c99c7fc64aeaf669e4c6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-252
---
srcpkgs/systemd-boot-efistub/template | 51 +++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/template
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 000000000000..3b400918170e
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,51 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=252
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dgnu-efi=true -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib
+ -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
+ -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dblkid=false -Dkernel-install=false
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2"
+makedepends="gnu-efi-libs libcap-devel libmount-devel"
+short_desc="Linux UEFI stub from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://systemd.io"
+distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
+checksum=113a9342ddf89618a17c4056c2dd72c4b20b28af8da135786d7e9b4f1d18acfb
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ riscv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+
+do_install() {
+ vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd/boot/efi
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (6 preceding siblings ...)
2023-03-11 19:26 ` classabbyamp
@ 2023-03-11 19:38 ` classabbyamp
2023-03-11 20:14 ` classabbyamp
` (38 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-11 19:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
not using the latest version due to musl failures (https://github.com/systemd/systemd/pull/26689), which should be fixed in the next release.
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 3281 bytes --]
From 4c4e943cea4ed29a1f7c93ec1a5844ad8cfc6869 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-252
---
srcpkgs/systemd-boot-efistub/template | 52 +++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/template
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 000000000000..7d5efc8202ed
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,52 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=252
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dgnu-efi=true -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib
+ -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
+ -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dblkid=false -Dkernel-install=false
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2"
+makedepends="gnu-efi-libs libcap-devel libmount-devel"
+short_desc="Linux UEFI stub from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://systemd.io"
+distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
+checksum=113a9342ddf89618a17c4056c2dd72c4b20b28af8da135786d7e9b4f1d18acfb
+make_check=no # missing printf.h
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ riscv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+
+do_install() {
+ vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd/boot/efi
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (7 preceding siblings ...)
2023-03-11 19:38 ` classabbyamp
@ 2023-03-11 20:14 ` classabbyamp
2023-03-13 1:48 ` prez
` (37 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-11 20:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 5156 bytes --]
From 3800755944ed2df524cdf33adcf141e9349562a2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-253
---
.../systemd-boot-efistub/patches/musl.patch | 41 +++++++++++++++
srcpkgs/systemd-boot-efistub/template | 52 +++++++++++++++++++
2 files changed, 93 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/patches/musl.patch
create mode 100644 srcpkgs/systemd-boot-efistub/template
diff --git a/srcpkgs/systemd-boot-efistub/patches/musl.patch b/srcpkgs/systemd-boot-efistub/patches/musl.patch
new file mode 100644
index 000000000000..85d5a7fd2642
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/patches/musl.patch
@@ -0,0 +1,41 @@
+From a4ff7772acf1d983921833aa20ccd7c4d5e59a1c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Mon, 6 Mar 2023 15:24:49 +0100
+Subject: [PATCH] src/boot/efi/efi-string.c: define wchar_t from __WCHAR_TYPE__
+
+systemd-boot relies on wchar_t being 16 bit, and breaks at build time otherwise.
+
+To set wchar_t to 16 bit it is passing -fshort-wchar to gcc; this has the
+desired effect on glibc (which sets wchar_t from __WCHAR_TYPE__) but not on
+musl (which hardcodes it to 32 bit).
+
+This patch ensures wchar_t is set from the compiler flags on all systems; note
+that systemd-boot is not actually using functions from musl or other libc, just their headers.
+
+Meanwhile upstream has refactored the code to not rely on libc headers at all;
+however this will not be backported to v253 and we need a different fix.
+
+Upstream-Status: Inappropriate [fixed differently in trunk according to https://github.com/systemd/systemd/pull/26689]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ src/boot/efi/efi-string.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/boot/efi/efi-string.c b/src/boot/efi/efi-string.c
+index 22923d60f6..22a8d1ef71 100644
+--- a/src/boot/efi/efi-string.c
++++ b/src/boot/efi/efi-string.c
+@@ -2,7 +2,13 @@
+
+ #include <stdbool.h>
+ #include <stdint.h>
++
++#if SD_BOOT
++typedef __WCHAR_TYPE__ wchar_t;
++#define __DEFINED_wchar_t
++#else
+ #include <wchar.h>
++#endif
+
+ #include "efi-string.h"
+
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 000000000000..77e7f93a7910
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,52 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=253
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dgnu-efi=true -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib
+ -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
+ -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dblkid=false -Dkernel-install=false
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2"
+makedepends="gnu-efi-libs libcap-devel libmount-devel"
+short_desc="Linux UEFI stub from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://systemd.io"
+distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
+checksum=acbd86d42ebc2b443722cb469ad215a140f504689c7a9133ecf91b235275a491
+make_check=no # missing printf.h
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ riscv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+
+do_install() {
+ vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd/boot/efi
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (8 preceding siblings ...)
2023-03-11 20:14 ` classabbyamp
@ 2023-03-13 1:48 ` prez
2023-03-13 2:12 ` classabbyamp
` (36 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: prez @ 2023-03-13 1:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1465384277
Comment:
Can you include `bootctl` to install this?
And I guess hooks are needed to create the boot menu entries?
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (9 preceding siblings ...)
2023-03-13 1:48 ` prez
@ 2023-03-13 2:12 ` classabbyamp
2023-03-13 6:44 ` sonnysighedup
` (35 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-13 2:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1465403248
Comment:
this is _just_ the stub, which can be used by unified kernel images or other bootloaders like zfsbootmenu to boot directly.
I'm not sure if full systemd-boot would work without other systemd components, but I'm also not interested in it so I don't really care to add it.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (10 preceding siblings ...)
2023-03-13 2:12 ` classabbyamp
@ 2023-03-13 6:44 ` sonnysighedup
2023-03-13 6:45 ` sonnysighedup
` (34 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: sonnysighedup @ 2023-03-13 6:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
New comment by sonnysighedup on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1465594719
Comment:
Thank you @classabbyamp for doing creating this and for solving the musl-build issue!
I successfully built it locally on void-musl and used it to boot a secure-boot-enabled UEFI image of the current repository version of linux6.2.
[Sounds like this will also work with limine](https://github.com/limine-bootloader/limine/issues/256#issuecomment-1465294605) for those that want to use a separate bootloader.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (11 preceding siblings ...)
2023-03-13 6:44 ` sonnysighedup
@ 2023-03-13 6:45 ` sonnysighedup
2023-03-13 11:24 ` NymanMatthias
` (33 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: sonnysighedup @ 2023-03-13 6:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
New comment by sonnysighedup on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1465594719
Comment:
Thank you @classabbyamp for creating this and for solving the musl-build issue!
I successfully built it locally on void-musl and used it to boot a secure-boot-enabled UEFI image of the current repository version of linux6.2.
[Sounds like this will also work with limine](https://github.com/limine-bootloader/limine/issues/256#issuecomment-1465294605) for those that want to use a separate bootloader.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (12 preceding siblings ...)
2023-03-13 6:45 ` sonnysighedup
@ 2023-03-13 11:24 ` NymanMatthias
2023-03-14 22:18 ` prez
` (32 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: NymanMatthias @ 2023-03-13 11:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by NymanMatthias on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1465967681
Comment:
Yes, this it does work with limine. This was on void-musl.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (13 preceding siblings ...)
2023-03-13 11:24 ` NymanMatthias
@ 2023-03-14 22:18 ` prez
2023-03-14 22:23 ` prez
` (31 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: prez @ 2023-03-14 22:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 849 bytes --]
New comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1468916331
Comment:
> this is _just_ the stub, which can be used by unified kernel images or other bootloaders like zfsbootmenu to boot directly.
>
> I'm not sure if full systemd-boot would work without other systemd components, but I'm also not interested in it so I don't really care to add it.
I would like to ask you to reconsider.
Merging this package for just the stub is okay, but it's not a lot of additional work to include the rest. You only need `kernel-install`, `bootctl`, their manpages and `systemd-boot${_efi_arch}.efi` in addition to the stub for the full suite.
Merging this without these would also make it unlikely to ever have them in the repo since maintaining two systemd templates is infeasible.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (14 preceding siblings ...)
2023-03-14 22:18 ` prez
@ 2023-03-14 22:23 ` prez
2023-03-15 4:32 ` 0x5c
` (30 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: prez @ 2023-03-14 22:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 882 bytes --]
New comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1468916331
Comment:
> this is _just_ the stub, which can be used by unified kernel images or other bootloaders like zfsbootmenu to boot directly.
>
> I'm not sure if full systemd-boot would work without other systemd components, but I'm also not interested in it so I don't really care to add it.
I would like to ask you to reconsider.
Merging this package for just the stub is okay, but it's not a lot of additional work to include the rest (judging by the gentoo template). You only need `kernel-install`, `bootctl`, their manpages and `systemd-boot${_efi_arch}.efi` in addition to the stub for the full suite.
Merging this without these would also make it unlikely to ever have them in the repo since maintaining two systemd templates is infeasible.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (15 preceding siblings ...)
2023-03-14 22:23 ` prez
@ 2023-03-15 4:32 ` 0x5c
2023-03-15 4:41 ` classabbyamp
` (29 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: 0x5c @ 2023-03-15 4:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1469313710
Comment:
> Merging this without these would also make it unlikely to ever have them in the repo since maintaining two systemd templates is infeasible.
This wouldn't require a change on the package name; so if sysd-boot is ever to be added, all that needs to happen is for the template to build the whole sysd-boot and moving the current package to a subpackage.
It's only when a package name (as built) changes that things get complicated
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (16 preceding siblings ...)
2023-03-15 4:32 ` 0x5c
@ 2023-03-15 4:41 ` classabbyamp
2023-03-15 12:04 ` prez
` (28 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-15 4:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 342 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1469319805
Comment:
> I would like to ask you to reconsider.
I already decided to do it to give continuity to the tens of gummiboot users, and also because the `ukify` script seemed interesting for secure booters
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (17 preceding siblings ...)
2023-03-15 4:41 ` classabbyamp
@ 2023-03-15 12:04 ` prez
2023-03-17 1:07 ` [PR PATCH] [Updated] " classabbyamp
` (27 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: prez @ 2023-03-15 12:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
New comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1469883524
Comment:
> > Merging this without these would also make it unlikely to ever have them in the repo since maintaining two systemd templates is infeasible.
>
> This wouldn't require a change on the package name; so if sysd-boot is ever to be added, all that needs to happen is for the template to build the whole sysd-boot and moving the current package to a subpackage.
>
> It's only when a package name (as built) changes that things get complicated
The package is named `systemd-boot-efistub`. For me, this implies that the package only includes the EFI stub out of the entire systemd-boot suite.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (18 preceding siblings ...)
2023-03-15 12:04 ` prez
@ 2023-03-17 1:07 ` classabbyamp
2023-03-17 1:43 ` 0x5c
` (26 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-03-17 1:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 12502 bytes --]
From 3800755944ed2df524cdf33adcf141e9349562a2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH 1/2] New package: systemd-boot-efistub-253
---
.../systemd-boot-efistub/patches/musl.patch | 41 +++++++++++++++
srcpkgs/systemd-boot-efistub/template | 52 +++++++++++++++++++
2 files changed, 93 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/patches/musl.patch
create mode 100644 srcpkgs/systemd-boot-efistub/template
diff --git a/srcpkgs/systemd-boot-efistub/patches/musl.patch b/srcpkgs/systemd-boot-efistub/patches/musl.patch
new file mode 100644
index 000000000000..85d5a7fd2642
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/patches/musl.patch
@@ -0,0 +1,41 @@
+From a4ff7772acf1d983921833aa20ccd7c4d5e59a1c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Mon, 6 Mar 2023 15:24:49 +0100
+Subject: [PATCH] src/boot/efi/efi-string.c: define wchar_t from __WCHAR_TYPE__
+
+systemd-boot relies on wchar_t being 16 bit, and breaks at build time otherwise.
+
+To set wchar_t to 16 bit it is passing -fshort-wchar to gcc; this has the
+desired effect on glibc (which sets wchar_t from __WCHAR_TYPE__) but not on
+musl (which hardcodes it to 32 bit).
+
+This patch ensures wchar_t is set from the compiler flags on all systems; note
+that systemd-boot is not actually using functions from musl or other libc, just their headers.
+
+Meanwhile upstream has refactored the code to not rely on libc headers at all;
+however this will not be backported to v253 and we need a different fix.
+
+Upstream-Status: Inappropriate [fixed differently in trunk according to https://github.com/systemd/systemd/pull/26689]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ src/boot/efi/efi-string.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/boot/efi/efi-string.c b/src/boot/efi/efi-string.c
+index 22923d60f6..22a8d1ef71 100644
+--- a/src/boot/efi/efi-string.c
++++ b/src/boot/efi/efi-string.c
+@@ -2,7 +2,13 @@
+
+ #include <stdbool.h>
+ #include <stdint.h>
++
++#if SD_BOOT
++typedef __WCHAR_TYPE__ wchar_t;
++#define __DEFINED_wchar_t
++#else
+ #include <wchar.h>
++#endif
+
+ #include "efi-string.h"
+
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 000000000000..77e7f93a7910
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,52 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=253
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dgnu-efi=true -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib
+ -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
+ -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dblkid=false -Dkernel-install=false
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2"
+makedepends="gnu-efi-libs libcap-devel libmount-devel"
+short_desc="Linux UEFI stub from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://systemd.io"
+distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
+checksum=acbd86d42ebc2b443722cb469ad215a140f504689c7a9133ecf91b235275a491
+make_check=no # missing printf.h
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ riscv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+
+do_install() {
+ vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd/boot/efi
+}
From 1bea2632fb2b86c38aac267fc035567a1d3ad31b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 15 Mar 2023 20:40:35 -0400
Subject: [PATCH 2/2] fixup! New package: systemd-boot-efistub-253
---
srcpkgs/systemd-boot-efistub | 1 +
srcpkgs/systemd-boot/files/systemd-boot.confd | 2 +
.../files/systemd-boot.post-install | 45 ++++++++++++++++
.../files/systemd-boot.post-remove | 0
.../patches/musl.patch | 0
.../template | 53 +++++++++++++++----
6 files changed, 90 insertions(+), 11 deletions(-)
create mode 120000 srcpkgs/systemd-boot-efistub
create mode 100644 srcpkgs/systemd-boot/files/systemd-boot.confd
create mode 100644 srcpkgs/systemd-boot/files/systemd-boot.post-install
create mode 100644 srcpkgs/systemd-boot/files/systemd-boot.post-remove
rename srcpkgs/{systemd-boot-efistub => systemd-boot}/patches/musl.patch (100%)
rename srcpkgs/{systemd-boot-efistub => systemd-boot}/template (55%)
diff --git a/srcpkgs/systemd-boot-efistub b/srcpkgs/systemd-boot-efistub
new file mode 120000
index 000000000000..171756f5fb67
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub
@@ -0,0 +1 @@
+systemd-boot
\ No newline at end of file
diff --git a/srcpkgs/systemd-boot/files/systemd-boot.confd b/srcpkgs/systemd-boot/files/systemd-boot.confd
new file mode 100644
index 000000000000..eaad017a16ba
--- /dev/null
+++ b/srcpkgs/systemd-boot/files/systemd-boot.confd
@@ -0,0 +1,2 @@
+# uncomment this line to disable the systemd-boot hook
+# SYSTEMD_BOOT_DISABLE=1
diff --git a/srcpkgs/systemd-boot/files/systemd-boot.post-install b/srcpkgs/systemd-boot/files/systemd-boot.post-install
new file mode 100644
index 000000000000..707e2750eeec
--- /dev/null
+++ b/srcpkgs/systemd-boot/files/systemd-boot.post-install
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# Kernel hook for systemd-boot.
+#
+# Arguments passed to this script: $1 pkgname, $2 version.
+#
+PKGNAME="$1"
+VERSION="$2"
+
+. "$ROOTDIR/etc/default/systemd-boot"
+
+if [ "$SYSTEMD_BOOT_DISABLE" ]; then
+ exit 0
+fi
+
+boot="$ROOTDIR/boot"
+entries="$boot/loader/entries"
+name="void-$VERSION"
+entry="$entries/$name.conf"
+options="$boot/loader/void-options.conf"
+loader="$boot/loader/loader.conf"
+
+[ -d "$boot" ] || exit 0
+
+mkdir -p "$entries"
+
+cat <<-EOF > "$entry"
+ title Void Linux
+ version $VERSION
+ linux /vmlinuz-$VERSION
+ initrd /initramfs-$VERSION.img
+EOF
+
+if [ -r "$options" ]; then
+ # Add user provided options from /boot/loader/void-options.conf:
+ printf 'options %s\n' "$(cat "$options" | sed '/^#/d;/^$/d')" >> "$entry"
+fi
+
+if grep -q ^default "$loader" 2>/dev/null; then
+ # Replace existing default entry with this entry:
+ sed -i "s/default.*/default $name/" "$loader"
+else
+ # Add this entry as the default:
+ printf 'default %s\n' $name >>"$loader"
+fi
diff --git a/srcpkgs/systemd-boot/files/systemd-boot.post-remove b/srcpkgs/systemd-boot/files/systemd-boot.post-remove
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/systemd-boot-efistub/patches/musl.patch b/srcpkgs/systemd-boot/patches/musl.patch
similarity index 100%
rename from srcpkgs/systemd-boot-efistub/patches/musl.patch
rename to srcpkgs/systemd-boot/patches/musl.patch
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot/template
similarity index 55%
rename from srcpkgs/systemd-boot-efistub/template
rename to srcpkgs/systemd-boot/template
index 77e7f93a7910..007be7af1bf1 100644
--- a/srcpkgs/systemd-boot-efistub/template
+++ b/srcpkgs/systemd-boot/template
@@ -1,11 +1,14 @@
-# Template file for 'systemd-boot-efistub'
-pkgname=systemd-boot-efistub
+# Template file for 'systemd-boot'
+pkgname=systemd-boot
version=253
revision=1
build_style=meson
configure_args="-Defi=true -Dgnu-efi=true -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib
-Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
- -Dlink-boot-shared=false -Dstandalone-binaries=true
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url=https://github.com/void-linux/void-packages/issues
+ -Dblkid=true -Dkernel-install=true -Dlink-boot-shared=false
+ -Dstandalone-binaries=true -Dman=true
-Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
-Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
-Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
@@ -22,17 +25,15 @@ configure_args="-Defi=true -Dgnu-efi=true -Defi-libdir=${XBPS_CROSS_BASE}/usr/li
-Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
-Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
-Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
- -Dblkid=false -Dkernel-install=false
- -Dsbat-distro=void -Dsbat-distro-summary=Void
- -Dsbat-distro-url='https://github.com/void-linux/void-packages/issues'
-Dtests=false"
# most of these aren't needed for what we're building but it's easier than patching
-hostmakedepends="pkg-config gperf python3-Jinja2"
+hostmakedepends="pkg-config gperf python3-Jinja2 libxslt docbook-xsl"
makedepends="gnu-efi-libs libcap-devel libmount-devel"
-short_desc="Linux UEFI stub from systemd-boot"
+depends="${pkgname}-efistub>=${version}_${revision}"
+short_desc="UEFI boot manager from systemd"
maintainer="classabbyamp <void@placeviolette.net>"
license="LGPL-2.1-or-later"
-homepage="https://systemd.io"
+homepage="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz"
checksum=acbd86d42ebc2b443722cb469ad215a140f504689c7a9133ecf91b235275a491
make_check=no # missing printf.h
@@ -45,8 +46,38 @@ case "${XBPS_TARGET_MACHINE}" in
riscv64*) _efi_arch="riscv64" ;;
*) broken="unknown efi architecture" ;;
esac
-make_build_target="src/boot/efi/linux${_efi_arch}.efi.stub"
+_bins=(bootctl kernel-install ukify)
+_mans=(man/bootctl.1 man/ukify.1 man/loader.conf.5 man/systemd-boot.7 man/systemd-stub.7 man/kernel-install.8)
+_efis=("src/boot/efi/linux${_efi_arch}.efi.stub" "src/boot/efi/systemd-boot${_efi_arch}.efi")
+make_build_target="${_bins[*]} ${_mans[*]} ${_efis[*]} 90-loaderentry.install"
do_install() {
- vinstall build/src/boot/efi/linux${_efi_arch}.efi.stub 644 usr/lib/systemd/boot/efi
+ for b in "${_bins[@]}"; do
+ vbin "build/$b"
+ done
+ for m in build/man/*.[0-9]; do
+ vman "$m"
+ done
+ for c in bootctl kernel-install; do
+ vcompletion "shell-completion/bash/$c" bash "${c%*/}"
+ vcompletion "shell-completion/zsh/_$c" zsh "${c%*/_}"
+ done
+ for e in "${_efis[@]}"; do
+ vinstall "build/$e" 644 usr/lib/systemd/boot/efi
+ done
+ for f in build/90-loaderentry.install src/kernel-install/50-depmod.install src/kernel-install/90-uki-copy.install; do
+ vinstall "$f" 755 usr/lib/kernel/install.d
+ done
+
+ vinstall "${FILESDIR}/systemd-boot.post-install" 744 etc/kernel.d/post-install 50-systemd-boot
+ vinstall "${FILESDIR}/systemd-boot.post-remove" 744 etc/kernel.d/post-remove 50-systemd-boot
+ vinstall "${FILESDIR}/systemd-boot.confd" 644 etc/default systemd-boot
+}
+
+systemd-boot-efistub_package() {
+ short_desc+=" - UEFI stub loader"
+ pkg_install() {
+ vmove "usr/lib/systemd/boot/efi/*.efi.stub"
+ vmove "usr/share/man/man7/*stub.7"
+ }
}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (19 preceding siblings ...)
2023-03-17 1:07 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-03-17 1:43 ` 0x5c
2023-03-30 12:31 ` [PR REVIEW] " prez
` (25 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: 0x5c @ 2023-03-17 1:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1472988177
Comment:
> The package is named `systemd-boot-efistub`. For me, this implies that the package only includes the EFI stub out of the entire systemd-boot suite.
This isn't much relevant anymore since this PR got updated anyways, but there would not have been any snags post merge had it not been.
The only thing that can't be renamed (easily) is a built package. Where that package comes from (template of the same name, subpackage in a different template, something else outside xbps-src, etc) has no effect.
So going from a template named `systemd-boot-efistub` (that builds and packages the stub and related files) to a `systemd-boot` template (that builds and packages `systemd-boot` and subpackages the stub as `systemd-boot-efistub`) does not incur a special cost and doesn't cause a package to be renamed.
Once the packages are built the only difference is the existence of `systemd-boot`; the stub package remains the same.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (20 preceding siblings ...)
2023-03-17 1:43 ` 0x5c
@ 2023-03-30 12:31 ` prez
2023-03-30 12:31 ` prez
` (24 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: prez @ 2023-03-30 12:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
New review comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#discussion_r1153188716
Comment:
```suggestion
for f in build/src/kernel-install/90-loaderentry.install src/kernel-install/50-depmod.install src/kernel-install/90-uki-copy.install; do
```
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (21 preceding siblings ...)
2023-03-30 12:31 ` [PR REVIEW] " prez
@ 2023-03-30 12:31 ` prez
2023-04-02 19:48 ` prez
` (23 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: prez @ 2023-03-30 12:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
New review comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#discussion_r1153187149
Comment:
```suggestion
make_build_target="${_bins[*]} ${_mans[*]} ${_efis[*]} src/kernel-install/90-loaderentry.install"
```
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (22 preceding siblings ...)
2023-03-30 12:31 ` prez
@ 2023-04-02 19:48 ` prez
2023-04-02 20:00 ` classabbyamp
` (22 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: prez @ 2023-04-02 19:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
New comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1493424924
Comment:
I've been testing this on my system (x86_64 glibc) - systemd-boot works well.
The hook could use some logic to check whether the configured kernel is newer than the current default one (always replacing the default with a potentially older kernel isn't expected behaviour, I think).
And here's a suggestion for a post-remove hook:
```sh
#!/bin/sh
#
# Kernel post-remove hook for systemd-boot.
#
# Arguments passed to this script: $1 pkgname, $2 version.
#
PKGNAME="$1"
VERSION="$2"
. "$ROOTDIR/etc/default/systemd-boot"
if [ "$SYSTEMD_BOOT_DISABLE" ]; then
exit 0
fi
boot="$ROOTDIR/boot"
entries="$boot/loader/entries"
name="void-$VERSION"
entry="$entries/$name.conf"
loader="$boot/loader/loader.conf"
[ -r "$loader" ] || exit 0
rm -f "$entry"
if grep -q "^default ${name}" "$loader" 2>/dev/null; then
# Replace removed default entry with another
alternative="$(ls -r "$entries" | head -n 1)"
[ -n "$alternative" ] || exit 0
sed -i "s/default.*/default ${alternative%.conf}/" "$loader"
fi
```
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (23 preceding siblings ...)
2023-04-02 19:48 ` prez
@ 2023-04-02 20:00 ` classabbyamp
2023-04-25 11:57 ` junkmanner
` (21 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-04-02 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1493427091
Comment:
the hook as it stands is mostly wrong, i copied it from gummiboot. sysd-boot provides some utilities for interacting with the config, so it should use that instead of manually writing a conf
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (24 preceding siblings ...)
2023-04-02 20:00 ` classabbyamp
@ 2023-04-25 11:57 ` junkmanner
2023-04-25 14:04 ` classabbyamp
` (20 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: junkmanner @ 2023-04-25 11:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by junkmanner on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1521663329
Comment:
Only the old version, which only built the efistub builds on x86_64-musl
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (25 preceding siblings ...)
2023-04-25 11:57 ` junkmanner
@ 2023-04-25 14:04 ` classabbyamp
2023-04-25 14:04 ` classabbyamp
` (19 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-04-25 14:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1521848883
Comment:
what?
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (26 preceding siblings ...)
2023-04-25 14:04 ` classabbyamp
@ 2023-04-25 14:04 ` classabbyamp
2023-04-25 14:04 ` classabbyamp
` (18 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-04-25 14:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1521848883
Comment:
what?
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (27 preceding siblings ...)
2023-04-25 14:04 ` classabbyamp
@ 2023-04-25 14:04 ` classabbyamp
2023-07-25 2:01 ` github-actions
` (17 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-04-25 14:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1521849762
Comment:
this is still heavily WIP, do not expect it to work
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (28 preceding siblings ...)
2023-04-25 14:04 ` classabbyamp
@ 2023-07-25 2:01 ` github-actions
2023-09-08 8:03 ` [PR PATCH] [Updated] " classabbyamp
` (16 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: github-actions @ 2023-07-25 2:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1648853908
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (29 preceding siblings ...)
2023-07-25 2:01 ` github-actions
@ 2023-09-08 8:03 ` classabbyamp
2023-09-08 8:04 ` classabbyamp
` (15 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-09-08 8:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-253
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 7001 bytes --]
From 3e8ca5df4e23c59cc7d6962e3c623fc8e6084eb5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-254.2
---
srcpkgs/systemd-boot-efistub | 1 +
srcpkgs/systemd-boot/files/systemd-boot.confd | 2 +
.../files/systemd-boot.post-install | 45 ++++++++++
.../files/systemd-boot.post-remove | 0
srcpkgs/systemd-boot/template | 86 +++++++++++++++++++
5 files changed, 134 insertions(+)
create mode 120000 srcpkgs/systemd-boot-efistub
create mode 100644 srcpkgs/systemd-boot/files/systemd-boot.confd
create mode 100644 srcpkgs/systemd-boot/files/systemd-boot.post-install
create mode 100644 srcpkgs/systemd-boot/files/systemd-boot.post-remove
create mode 100644 srcpkgs/systemd-boot/template
diff --git a/srcpkgs/systemd-boot-efistub b/srcpkgs/systemd-boot-efistub
new file mode 120000
index 0000000000000..171756f5fb675
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub
@@ -0,0 +1 @@
+systemd-boot
\ No newline at end of file
diff --git a/srcpkgs/systemd-boot/files/systemd-boot.confd b/srcpkgs/systemd-boot/files/systemd-boot.confd
new file mode 100644
index 0000000000000..eaad017a16baf
--- /dev/null
+++ b/srcpkgs/systemd-boot/files/systemd-boot.confd
@@ -0,0 +1,2 @@
+# uncomment this line to disable the systemd-boot hook
+# SYSTEMD_BOOT_DISABLE=1
diff --git a/srcpkgs/systemd-boot/files/systemd-boot.post-install b/srcpkgs/systemd-boot/files/systemd-boot.post-install
new file mode 100644
index 0000000000000..707e2750eeecb
--- /dev/null
+++ b/srcpkgs/systemd-boot/files/systemd-boot.post-install
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# Kernel hook for systemd-boot.
+#
+# Arguments passed to this script: $1 pkgname, $2 version.
+#
+PKGNAME="$1"
+VERSION="$2"
+
+. "$ROOTDIR/etc/default/systemd-boot"
+
+if [ "$SYSTEMD_BOOT_DISABLE" ]; then
+ exit 0
+fi
+
+boot="$ROOTDIR/boot"
+entries="$boot/loader/entries"
+name="void-$VERSION"
+entry="$entries/$name.conf"
+options="$boot/loader/void-options.conf"
+loader="$boot/loader/loader.conf"
+
+[ -d "$boot" ] || exit 0
+
+mkdir -p "$entries"
+
+cat <<-EOF > "$entry"
+ title Void Linux
+ version $VERSION
+ linux /vmlinuz-$VERSION
+ initrd /initramfs-$VERSION.img
+EOF
+
+if [ -r "$options" ]; then
+ # Add user provided options from /boot/loader/void-options.conf:
+ printf 'options %s\n' "$(cat "$options" | sed '/^#/d;/^$/d')" >> "$entry"
+fi
+
+if grep -q ^default "$loader" 2>/dev/null; then
+ # Replace existing default entry with this entry:
+ sed -i "s/default.*/default $name/" "$loader"
+else
+ # Add this entry as the default:
+ printf 'default %s\n' $name >>"$loader"
+fi
diff --git a/srcpkgs/systemd-boot/files/systemd-boot.post-remove b/srcpkgs/systemd-boot/files/systemd-boot.post-remove
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/srcpkgs/systemd-boot/template b/srcpkgs/systemd-boot/template
new file mode 100644
index 0000000000000..f733967b63840
--- /dev/null
+++ b/srcpkgs/systemd-boot/template
@@ -0,0 +1,86 @@
+# Template file for 'systemd-boot'
+pkgname=systemd-boot
+version=254.2
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dbootloader=true
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url=https://github.com/void-linux/void-packages/issues
+ -Dblkid=true -Dkernel-install=true -Dlink-boot-shared=false
+ -Dstandalone-binaries=true -Dman=true
+
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2 libxslt docbook-xsl"
+makedepends="libcap-devel libmount-devel python3-pyelftools"
+depends="${pkgname}-efistub>=${version}_${revision}"
+short_desc="UEFI boot manager from systemd"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
+distfiles="https://github.com/systemd/systemd-stable/archive/refs/tags/v${version}.tar.gz"
+checksum=6ebfb6ed1fbd601b56a23114b4905061ce03ab9ab8a5cccad1f8851606969c5d
+make_check=no # missing printf.h
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ riscv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+
+_bins=(bootctl kernel-install ukify)
+_mans=(man/bootctl.1 man/ukify.1 man/loader.conf.5 man/systemd-boot.7 man/systemd-stub.7 man/kernel-install.8)
+_efis=("src/boot/efi/linux${_efi_arch}.efi.stub" "src/boot/efi/systemd-boot${_efi_arch}.efi")
+_other=(src/kernel-install/90-loaderentry.install)
+make_build_target="${_bins[*]} ${_mans[*]} ${_efis[*]} ${_other[*]}"
+
+do_install() {
+ for b in "${_bins[@]}"; do
+ vbin "build/$b"
+ done
+ for m in build/man/*.[0-9]; do
+ vman "$m"
+ done
+ for c in bootctl kernel-install; do
+ vcompletion "shell-completion/bash/$c" bash "${c%*/}"
+ vcompletion "shell-completion/zsh/_$c" zsh "${c%*/_}"
+ done
+ for e in "${_efis[@]}"; do
+ vinstall "build/$e" 644 usr/lib/systemd/boot/efi
+ done
+ for f in build/src/kernel-install/90-loaderentry.install src/kernel-install/50-depmod.install \
+ src/kernel-install/90-uki-copy.install; do
+ vinstall "$f" 755 usr/lib/kernel/install.d
+ done
+
+ vinstall "${FILESDIR}/systemd-boot.post-install" 744 etc/kernel.d/post-install 50-systemd-boot
+ vinstall "${FILESDIR}/systemd-boot.post-remove" 744 etc/kernel.d/post-remove 50-systemd-boot
+ vinstall "${FILESDIR}/systemd-boot.confd" 644 etc/default systemd-boot
+}
+
+systemd-boot-efistub_package() {
+ short_desc+=" - UEFI stub loader"
+ pkg_install() {
+ vmove "usr/lib/systemd/boot/efi/*.efi.stub"
+ vmove "usr/share/man/man7/*stub.7"
+ }
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-efistub-253
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (30 preceding siblings ...)
2023-09-08 8:03 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-09-08 8:04 ` classabbyamp
2023-09-08 8:06 ` New package: systemd-boot-254.2 classabbyamp
` (14 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-09-08 8:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1711251092
Comment:
currently known issue: kernel-install links libsystemd
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (31 preceding siblings ...)
2023-09-08 8:04 ` classabbyamp
@ 2023-09-08 8:06 ` classabbyamp
2023-09-08 8:27 ` [PR PATCH] [Updated] " classabbyamp
` (13 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-09-08 8:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1711251092
Comment:
currently known issue: kernel-install links libsystemd
TODO: split ukify (maybe?), ensure it has the right deps
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (32 preceding siblings ...)
2023-09-08 8:06 ` New package: systemd-boot-254.2 classabbyamp
@ 2023-09-08 8:27 ` classabbyamp
2023-09-08 8:29 ` classabbyamp
` (12 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-09-08 8:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 751 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-254.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 7656 bytes --]
From b3ff71473392221608366f7c721d098605a25e21 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-254.2
---
srcpkgs/systemd-boot-efistub | 1 +
srcpkgs/systemd-boot-ukify | 1 +
srcpkgs/systemd-boot/files/systemd-boot.confd | 2 +
.../files/systemd-boot.post-install | 45 +++++++++
.../files/systemd-boot.post-remove | 0
srcpkgs/systemd-boot/template | 99 +++++++++++++++++++
6 files changed, 148 insertions(+)
create mode 120000 srcpkgs/systemd-boot-efistub
create mode 120000 srcpkgs/systemd-boot-ukify
create mode 100644 srcpkgs/systemd-boot/files/systemd-boot.confd
create mode 100644 srcpkgs/systemd-boot/files/systemd-boot.post-install
create mode 100644 srcpkgs/systemd-boot/files/systemd-boot.post-remove
create mode 100644 srcpkgs/systemd-boot/template
diff --git a/srcpkgs/systemd-boot-efistub b/srcpkgs/systemd-boot-efistub
new file mode 120000
index 0000000000000..171756f5fb675
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub
@@ -0,0 +1 @@
+systemd-boot
\ No newline at end of file
diff --git a/srcpkgs/systemd-boot-ukify b/srcpkgs/systemd-boot-ukify
new file mode 120000
index 0000000000000..171756f5fb675
--- /dev/null
+++ b/srcpkgs/systemd-boot-ukify
@@ -0,0 +1 @@
+systemd-boot
\ No newline at end of file
diff --git a/srcpkgs/systemd-boot/files/systemd-boot.confd b/srcpkgs/systemd-boot/files/systemd-boot.confd
new file mode 100644
index 0000000000000..eaad017a16baf
--- /dev/null
+++ b/srcpkgs/systemd-boot/files/systemd-boot.confd
@@ -0,0 +1,2 @@
+# uncomment this line to disable the systemd-boot hook
+# SYSTEMD_BOOT_DISABLE=1
diff --git a/srcpkgs/systemd-boot/files/systemd-boot.post-install b/srcpkgs/systemd-boot/files/systemd-boot.post-install
new file mode 100644
index 0000000000000..707e2750eeecb
--- /dev/null
+++ b/srcpkgs/systemd-boot/files/systemd-boot.post-install
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# Kernel hook for systemd-boot.
+#
+# Arguments passed to this script: $1 pkgname, $2 version.
+#
+PKGNAME="$1"
+VERSION="$2"
+
+. "$ROOTDIR/etc/default/systemd-boot"
+
+if [ "$SYSTEMD_BOOT_DISABLE" ]; then
+ exit 0
+fi
+
+boot="$ROOTDIR/boot"
+entries="$boot/loader/entries"
+name="void-$VERSION"
+entry="$entries/$name.conf"
+options="$boot/loader/void-options.conf"
+loader="$boot/loader/loader.conf"
+
+[ -d "$boot" ] || exit 0
+
+mkdir -p "$entries"
+
+cat <<-EOF > "$entry"
+ title Void Linux
+ version $VERSION
+ linux /vmlinuz-$VERSION
+ initrd /initramfs-$VERSION.img
+EOF
+
+if [ -r "$options" ]; then
+ # Add user provided options from /boot/loader/void-options.conf:
+ printf 'options %s\n' "$(cat "$options" | sed '/^#/d;/^$/d')" >> "$entry"
+fi
+
+if grep -q ^default "$loader" 2>/dev/null; then
+ # Replace existing default entry with this entry:
+ sed -i "s/default.*/default $name/" "$loader"
+else
+ # Add this entry as the default:
+ printf 'default %s\n' $name >>"$loader"
+fi
diff --git a/srcpkgs/systemd-boot/files/systemd-boot.post-remove b/srcpkgs/systemd-boot/files/systemd-boot.post-remove
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/srcpkgs/systemd-boot/template b/srcpkgs/systemd-boot/template
new file mode 100644
index 0000000000000..8386c1d39e0fe
--- /dev/null
+++ b/srcpkgs/systemd-boot/template
@@ -0,0 +1,99 @@
+# Template file for 'systemd-boot'
+pkgname=systemd-boot
+version=254.2
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dbootloader=true
+ -Dsbat-distro=void -Dsbat-distro-summary=Void
+ -Dsbat-distro-url=https://github.com/void-linux/void-packages/issues
+ -Dblkid=true -Dkernel-install=true -Dlink-boot-shared=false
+ -Dstandalone-binaries=true -Dman=true
+
+ -Dacl=false -Dkmod=false -Dselinux=false -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=false -Daudit=false
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=false -Dbzip2=false
+ -Dcoredump=false -Ddbus=false -Delfutils=false -Denvironment-d=false
+ -Dfdisk=false -Dgcrypt=false -Dglib=false -Dgshadow=false -Dgnutls=false
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=false -Dlibcurl=false
+ -Dlibfido2=false -Dlibidn=false -Dlibidn2=false -Dlibiptc=false -Dlocaled=false
+ -Dlogind=false -Dlz4=false -Dmachined=false -Dmicrohttpd=false -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=false -Dnss-systemd=false
+ -Doomd=false -Dopenssl=false -Dp11kit=false -Dpam=false -Dpcre2=false
+ -Dpolkit=false -Dportabled=false -Dpstore=false -Dpwquality=false
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=false -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=false
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=false -Dxz=false -Dzlib=false -Dzstd=false
+ -Dtests=false"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2 python3-pyelftools libxslt docbook-xsl"
+makedepends="libcap-devel libmount-devel"
+depends="${pkgname}-efistub>=${version}_${revision}"
+short_desc="UEFI boot manager from systemd"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
+distfiles="https://github.com/systemd/systemd-stable/archive/refs/tags/v${version}.tar.gz"
+checksum=6ebfb6ed1fbd601b56a23114b4905061ce03ab9ab8a5cccad1f8851606969c5d
+make_check=no # missing printf.h
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ riscv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+
+_bins=(bootctl kernel-install ukify)
+_mans=(man/bootctl.1 man/ukify.1 man/loader.conf.5 man/systemd-boot.7 man/systemd-stub.7 man/kernel-install.8)
+_efis=("src/boot/efi/linux${_efi_arch}.efi.stub" "src/boot/efi/systemd-boot${_efi_arch}.efi")
+_hooks=(src/kernel-install/60-ukify.install src/kernel-install/90-loaderentry.install)
+make_build_target="${_bins[*]} ${_mans[*]} ${_efis[*]} ${_hooks[*]}"
+
+do_install() {
+ for b in "${_bins[@]}"; do
+ vbin "build/$b"
+ done
+ for m in build/man/*.[0-9]; do
+ vman "$m"
+ done
+ for c in bootctl kernel-install; do
+ vcompletion "shell-completion/bash/$c" bash "${c%*/}"
+ vcompletion "shell-completion/zsh/_$c" zsh "${c%*/_}"
+ done
+ for e in "${_efis[@]}"; do
+ vinstall "build/$e" 644 usr/lib/systemd/boot/efi
+ done
+ for f in src/kernel-install/50-depmod.install src/kernel-install/90-uki-copy.install; do
+ vinstall "$f" 755 usr/lib/kernel/install.d
+ done
+
+ for f in "${_hooks[@]}"; do
+ vinstall "build/$f" 755 usr/lib/kernel/install.d
+ done
+
+ vinstall "${FILESDIR}/systemd-boot.post-install" 744 etc/kernel.d/post-install 50-systemd-boot
+ vinstall "${FILESDIR}/systemd-boot.post-remove" 744 etc/kernel.d/post-remove 50-systemd-boot
+ vinstall "${FILESDIR}/systemd-boot.confd" 644 etc/default systemd-boot
+}
+
+systemd-boot-efistub_package() {
+ short_desc+=" - UEFI stub loader"
+ pkg_install() {
+ vmove "usr/lib/systemd/boot/efi/*.efi.stub"
+ vmove "usr/share/man/man7/*stub.7"
+ }
+}
+
+systemd-boot-ukify_package() {
+ short_desc+=" - Unified Kernel Image creation support"
+ depends="python3-pefile"
+ pkg_install() {
+ vmove usr/bin/ukify
+ vmove usr/share/man/man1/ukify.1
+ vmove usr/lib/kernel/install.d/60-ukify.install
+ }
+}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (33 preceding siblings ...)
2023-09-08 8:27 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-09-08 8:29 ` classabbyamp
2023-10-05 11:31 ` MeganerdNL
` (11 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-09-08 8:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1711251092
Comment:
currently known issue: kernel-install links libsystemd
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (34 preceding siblings ...)
2023-09-08 8:29 ` classabbyamp
@ 2023-10-05 11:31 ` MeganerdNL
2023-10-05 11:32 ` MeganerdNL
` (10 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: MeganerdNL @ 2023-10-05 11:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 672 bytes --]
New comment by MeganerdNL on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1748702809
Comment:
This would be very welcome for me, because I it enables me to use full disk encryption with LUKS2 argon2i, that is still not possible with grub (and LUKS2 is very slow anyway via github). Besides, I also like to directly boot UKI's, it's fast. I have it working on my laptop with the help mkinitcpio (not tried dracut if that's possible), but only by pulling the compiled `linuxx64.efi.stub` file from Arch (https://aur.archlinux.org/packages/efistub-standalone) and put in the right place on Void. Wonky, but it works for now.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (35 preceding siblings ...)
2023-10-05 11:31 ` MeganerdNL
@ 2023-10-05 11:32 ` MeganerdNL
2023-10-05 11:42 ` MeganerdNL
` (9 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: MeganerdNL @ 2023-10-05 11:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 670 bytes --]
New comment by MeganerdNL on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1748702809
Comment:
This would be very welcome for me, because it enables me to use full disk encryption with LUKS2 argon2i, that is still not possible with grub (and LUKS2 is very slow anyway via github). Besides, I also like to directly boot UKI's, it's fast. I have it working on my laptop with the help mkinitcpio (not tried dracut if that's possible), but only by pulling the compiled `linuxx64.efi.stub` file from Arch (https://aur.archlinux.org/packages/efistub-standalone) and put in the right place on Void. Wonky, but it works for now.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (36 preceding siblings ...)
2023-10-05 11:32 ` MeganerdNL
@ 2023-10-05 11:42 ` MeganerdNL
2023-10-05 12:18 ` classabbyamp
` (8 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: MeganerdNL @ 2023-10-05 11:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
New comment by MeganerdNL on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1748702809
Comment:
This would be very welcome for me, because it enables me to use full disk encryption with LUKS2 argon2i, that is still not possible with grub (and LUKS2 is very slow anyway via grub). Besides, I also like to directly boot UKI's, it's fast. I have it working on my laptop with the help mkinitcpio (not tried dracut if that's possible), but only by pulling the compiled `linuxx64.efi.stub` file from Arch (https://aur.archlinux.org/packages/efistub-standalone) and put in the right place on Void. Wonky, but it works for now.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (37 preceding siblings ...)
2023-10-05 11:42 ` MeganerdNL
@ 2023-10-05 12:18 ` classabbyamp
2023-10-05 12:43 ` MeganerdNL
` (7 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2023-10-05 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1748782101
Comment:
the gummiboot efi stub still works, you don't have to grab arch's sysd-boot one
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (38 preceding siblings ...)
2023-10-05 12:18 ` classabbyamp
@ 2023-10-05 12:43 ` MeganerdNL
2024-01-04 1:46 ` github-actions
` (6 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: MeganerdNL @ 2023-10-05 12:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by MeganerdNL on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1748823300
Comment:
> the gummiboot efi stub still works, you don't have to grab arch's sysd-boot one
Missed that, thanks.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (39 preceding siblings ...)
2023-10-05 12:43 ` MeganerdNL
@ 2024-01-04 1:46 ` github-actions
2024-02-01 20:53 ` dkwo
` (5 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: github-actions @ 2024-01-04 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1876198020
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (40 preceding siblings ...)
2024-01-04 1:46 ` github-actions
@ 2024-02-01 20:53 ` dkwo
2024-02-01 20:53 ` dkwo
` (4 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: dkwo @ 2024-02-01 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1922224410
Comment:
for glibc, had to add `hostmakedepends+=" libxcrypt-devel"` to at least build the stub.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (41 preceding siblings ...)
2024-02-01 20:53 ` dkwo
@ 2024-02-01 20:53 ` dkwo
2024-02-01 21:26 ` dkwo
` (3 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: dkwo @ 2024-02-01 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1922225457
Comment:
see also a prior attempt https://github.com/void-linux/void-packages/pull/10469
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (42 preceding siblings ...)
2024-02-01 20:53 ` dkwo
@ 2024-02-01 21:26 ` dkwo
2024-02-02 18:56 ` [PR PATCH] [Updated] " classabbyamp
` (2 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: dkwo @ 2024-02-01 21:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42667#issuecomment-1922275104
Comment:
Unlike the gummiboot stub, with this stub the kernel correctly acknowldeges
```
$ doas dmesg | grep Secure
[ 0.018939] Secure boot enabled
```
at least if used in a uki.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-254.2
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (43 preceding siblings ...)
2024-02-01 21:26 ` dkwo
@ 2024-02-02 18:56 ` classabbyamp
2024-02-02 22:34 ` [PR PATCH] [Updated] New package: systemd-boot-efistub-255.3 classabbyamp
2024-02-02 22:50 ` [PR PATCH] [Merged]: " classabbyamp
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2024-02-02 18:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 751 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-254.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 4170 bytes --]
From 54b788bf4149e54fc64110a11342490e8160e268 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-255.3
---
srcpkgs/systemd-boot-efistub/template | 74 +++++++++++++++++++++++++++
srcpkgs/ukify | 1 +
2 files changed, 75 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/template
create mode 120000 srcpkgs/ukify
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 0000000000000..9a3d24d654148
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,74 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=255.3
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dman=enabled -Dbootloader=enabled
+ -Dsbat-distro=void -Dsbat-distro-summary=Void -Dsbat-distro-pkgname=${pkgname}
+ -Dsbat-distro-version="${version}_${revision}"
+ -Dsbat-distro-url=https://github.com/void-linux/void-packages/issues
+
+ -Dacl=disabled -Dkmod=disabled -Dselinux=disabled -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=disabled -Daudit=disabled
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=disabled -Dbzip2=disabled
+ -Dcoredump=false -Ddbus=disabled -Delfutils=disabled -Denvironment-d=false
+ -Dfdisk=disabled -Dgcrypt=disabled -Dglib=disabled -Dgshadow=false -Dgnutls=disabled
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=disabled -Dlibcurl=disabled
+ -Dlibfido2=disabled -Dlibidn=disabled -Dlibidn2=disabled -Dlibiptc=disabled -Dlocaled=false
+ -Dlogind=false -Dlz4=disabled -Dmachined=false -Dmicrohttpd=disabled -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=disabled -Dnss-systemd=false
+ -Doomd=false -Dopenssl=disabled -Dp11kit=disabled -Dpam=disabled -Dpcre2=disabled
+ -Dpolkit=disabled -Dportabled=false -Dpstore=false -Dpwquality=disabled
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=disabled -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=disabled
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=disabled -Dxz=disabled -Dzlib=disabled -Dzstd=disabled
+ -Dtests=false -Dkernel-install=false -Dlink-boot-shared=false -Dstandalone-binaries=true"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2 python3-pyelftools libxslt docbook-xsl"
+makedepends="libcap-devel libmount-devel libxcrypt-devel"
+short_desc="UEFI stub loader from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
+distfiles="https://github.com/systemd/systemd-stable/archive/refs/tags/v${version}.tar.gz"
+checksum=27807c65f969d0e0e44629dee8379e1e2c30e6c5e84be0389438c4ab1b225000
+make_check=no # missing printf.h
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ riscv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+
+_bins=(ukify)
+_mans=(man/ukify.1 man/systemd-stub.7)
+_efis=("src/boot/efi/linux${_efi_arch}.efi.stub")
+make_build_target="${_bins[*]} ${_mans[*]} ${_efis[*]}"
+
+do_install() {
+ for b in "${_bins[@]}"; do
+ vbin "build/$b"
+ done
+
+ for m in build/man/*.[0-9]; do
+ vman "$m"
+ done
+
+ for e in "${_efis[@]}"; do
+ vinstall "build/$e" 644 usr/lib/systemd/boot/efi
+ done
+}
+
+ukify_package() {
+ short_desc="Unified Kernel Image creation tool from systemd-boot"
+ depends="python3-pefile"
+ pkg_install() {
+ vmove usr/bin/ukify
+ vmove usr/share/man/man1/ukify.1
+ }
+}
diff --git a/srcpkgs/ukify b/srcpkgs/ukify
new file mode 120000
index 0000000000000..9258199038ee7
--- /dev/null
+++ b/srcpkgs/ukify
@@ -0,0 +1 @@
+systemd-boot-efistub
\ No newline at end of file
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] New package: systemd-boot-efistub-255.3
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (44 preceding siblings ...)
2024-02-02 18:56 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-02-02 22:34 ` classabbyamp
2024-02-02 22:50 ` [PR PATCH] [Merged]: " classabbyamp
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2024-02-02 22:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 759 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages sysd-boot-stub
https://github.com/void-linux/void-packages/pull/42667
New package: systemd-boot-efistub-255.3
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/42667.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sysd-boot-stub-42667.patch --]
[-- Type: text/x-diff, Size: 6486 bytes --]
From ac8a79e46ebd5993f0b52b670d3a348c299892ad Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Mar 2023 19:24:00 -0500
Subject: [PATCH] New package: systemd-boot-efistub-255.3
---
.../patches/musl-wchar_t.patch | 62 +++++++++++++++
srcpkgs/systemd-boot-efistub/template | 78 +++++++++++++++++++
srcpkgs/ukify | 1 +
3 files changed, 141 insertions(+)
create mode 100644 srcpkgs/systemd-boot-efistub/patches/musl-wchar_t.patch
create mode 100644 srcpkgs/systemd-boot-efistub/template
create mode 120000 srcpkgs/ukify
diff --git a/srcpkgs/systemd-boot-efistub/patches/musl-wchar_t.patch b/srcpkgs/systemd-boot-efistub/patches/musl-wchar_t.patch
new file mode 100644
index 0000000000000..5c8e58a20b1f2
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/patches/musl-wchar_t.patch
@@ -0,0 +1,62 @@
+diff --git a/src/fundamental/memory-util-fundamental.h b/src/fundamental/memory-util-fundamental.h
+index 78e2dbe..561e05f 100644
+--- a/src/fundamental/memory-util-fundamental.h
++++ b/src/fundamental/memory-util-fundamental.h
+@@ -1,11 +1,10 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ #pragma once
+
+-#include <stddef.h>
+-
+ #if SD_BOOT
+ # include "efi-string.h"
+ #else
++# include <stddef.h>
+ # include <string.h>
+ #endif
+
+diff --git a/src/fundamental/string-util-fundamental.c b/src/fundamental/string-util-fundamental.c
+index a5bafc6..0d7c08a 100644
+--- a/src/fundamental/string-util-fundamental.c
++++ b/src/fundamental/string-util-fundamental.c
+@@ -4,8 +4,8 @@
+ # include <ctype.h>
+ #endif
+
+-#include "macro-fundamental.h"
+ #include "string-util-fundamental.h"
++#include "macro-fundamental.h"
+
+ sd_char *startswith(const sd_char *s, const sd_char *prefix) {
+ size_t l;
+diff --git a/src/boot/efi/efi.h b/src/boot/efi/efi.h
+index 5c34668..50fca66 100644
+--- a/src/boot/efi/efi.h
++++ b/src/boot/efi/efi.h
+@@ -1,6 +1,14 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ #pragma once
+
++#if SD_BOOT
++#define __DEFINED_wchar_t
++/* uchar.h/wchar.h are not suitable for freestanding environments. */
++typedef __WCHAR_TYPE__ wchar_t;
++typedef __CHAR16_TYPE__ char16_t;
++typedef __CHAR32_TYPE__ char32_t;
++#endif
++
+ #include <stdarg.h>
+ #include <stdbool.h>
+ #include <stddef.h>
+@@ -9,11 +17,6 @@
+ #include "macro-fundamental.h"
+
+ #if SD_BOOT
+-/* uchar.h/wchar.h are not suitable for freestanding environments. */
+-typedef __WCHAR_TYPE__ wchar_t;
+-typedef __CHAR16_TYPE__ char16_t;
+-typedef __CHAR32_TYPE__ char32_t;
+-
+ /* Let's be paranoid and do some sanity checks. */
+ assert_cc(__STDC_HOSTED__ == 0);
+ assert_cc(sizeof(bool) == 1);
diff --git a/srcpkgs/systemd-boot-efistub/template b/srcpkgs/systemd-boot-efistub/template
new file mode 100644
index 0000000000000..a6d66172c09fb
--- /dev/null
+++ b/srcpkgs/systemd-boot-efistub/template
@@ -0,0 +1,78 @@
+# Template file for 'systemd-boot-efistub'
+pkgname=systemd-boot-efistub
+version=255.3
+revision=1
+build_style=meson
+configure_args="-Defi=true -Dman=enabled -Dbootloader=enabled
+ -Dsbat-distro=void -Dsbat-distro-summary=Void -Dsbat-distro-pkgname=${pkgname}
+ -Dsbat-distro-version="${version}_${revision}"
+ -Dsbat-distro-url=https://github.com/void-linux/void-packages/issues
+
+ -Dacl=disabled -Dkmod=disabled -Dselinux=disabled -Dsysusers=false -Dtmpfiles=false
+ -Dadm-group=false -Danalyze=false -Dapparmor=disabled -Daudit=disabled
+ -Dbacklight=false -Dbinfmt=false -Dbpf-framework=disabled -Dbzip2=disabled
+ -Dcoredump=false -Ddbus=disabled -Delfutils=disabled -Denvironment-d=false
+ -Dfdisk=disabled -Dgcrypt=disabled -Dglib=disabled -Dgshadow=false -Dgnutls=disabled
+ -Dhibernate=false -Dhostnamed=false -Didn=false -Dima=false -Dinitrd=false
+ -Dfirstboot=false -Dldconfig=false -Dlibcryptsetup=disabled -Dlibcurl=disabled
+ -Dlibfido2=disabled -Dlibidn=disabled -Dlibidn2=disabled -Dlibiptc=disabled -Dlocaled=false
+ -Dlogind=false -Dlz4=disabled -Dmachined=false -Dmicrohttpd=disabled -Dnetworkd=false
+ -Dnscd=false -Dnss-myhostname=false -Dnss-resolve=disabled -Dnss-systemd=false
+ -Doomd=false -Dopenssl=disabled -Dp11kit=disabled -Dpam=disabled -Dpcre2=disabled
+ -Dpolkit=disabled -Dportabled=false -Dpstore=false -Dpwquality=disabled
+ -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=disabled -Dsmack=false
+ -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false -Dqrencode=disabled
+ -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false
+ -Dxdg-autostart=false -Dxkbcommon=disabled -Dxz=disabled -Dzlib=disabled -Dzstd=disabled
+ -Dtests=false -Dkernel-install=false -Dlink-boot-shared=false -Dstandalone-binaries=true"
+# most of these aren't needed for what we're building but it's easier than patching
+hostmakedepends="pkg-config gperf python3-Jinja2 python3-pyelftools libxslt docbook-xsl"
+makedepends="libcap-devel libmount-devel"
+short_desc="UEFI stub loader from systemd-boot"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-2.1-or-later"
+homepage="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
+distfiles="https://github.com/systemd/systemd-stable/archive/refs/tags/v${version}.tar.gz"
+checksum=27807c65f969d0e0e44629dee8379e1e2c30e6c5e84be0389438c4ab1b225000
+make_check=no # missing printf.h
+
+if [ "${XBPS_TARGET_LIBC}" = glibc ]; then
+ makedepends+=" libxcrypt-devel"
+fi
+
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) _efi_arch="x64" ;;
+ i686*) _efi_arch="ia32" ;;
+ aarch64*) _efi_arch="aa64" ;;
+ arm*) _efi_arch="arm" ;;
+ riscv64*) _efi_arch="riscv64" ;;
+ *) broken="unknown efi architecture" ;;
+esac
+
+_bins=(ukify)
+_mans=(man/ukify.1 man/systemd-stub.7)
+_efis=("src/boot/efi/linux${_efi_arch}.efi.stub")
+make_build_target="${_bins[*]} ${_mans[*]} ${_efis[*]}"
+
+do_install() {
+ for b in "${_bins[@]}"; do
+ vbin "build/$b"
+ done
+
+ for m in build/man/*.[0-9]; do
+ vman "$m"
+ done
+
+ for e in "${_efis[@]}"; do
+ vinstall "build/$e" 644 usr/lib/systemd/boot/efi
+ done
+}
+
+ukify_package() {
+ short_desc="Unified Kernel Image creation tool from systemd-boot"
+ depends="python3-pefile"
+ pkg_install() {
+ vmove usr/bin/ukify
+ vmove usr/share/man/man1/ukify.1
+ }
+}
diff --git a/srcpkgs/ukify b/srcpkgs/ukify
new file mode 120000
index 0000000000000..9258199038ee7
--- /dev/null
+++ b/srcpkgs/ukify
@@ -0,0 +1 @@
+systemd-boot-efistub
\ No newline at end of file
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Merged]: New package: systemd-boot-efistub-255.3
2023-03-09 0:25 [PR PATCH] New package: systemd-boot-efistub-253 classabbyamp
` (45 preceding siblings ...)
2024-02-02 22:34 ` [PR PATCH] [Updated] New package: systemd-boot-efistub-255.3 classabbyamp
@ 2024-02-02 22:50 ` classabbyamp
46 siblings, 0 replies; 48+ messages in thread
From: classabbyamp @ 2024-02-02 22:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
There's a merged pull request on the void-packages repository
New package: systemd-boot-efistub-255.3
https://github.com/void-linux/void-packages/pull/42667
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
see #42566
thoroughly untested atm, but it builds the efistub
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
^ permalink raw reply [flat|nested] 48+ messages in thread