From 883b4113fbac52abcd556f890609630cbc869ccc Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 31 Mar 2024 13:31:07 -0400 Subject: [PATCH 1/9] common/xbps-src/shutils/build_dependencies: allow pkgdep for vpkgs this allows virtualpkg dependencies to use >/< version specifiers --- common/xbps-src/shutils/build_dependencies.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh index 57ef45a7d5dd42..aa0479f1e7ba00 100644 --- a/common/xbps-src/shutils/build_dependencies.sh +++ b/common/xbps-src/shutils/build_dependencies.sh @@ -22,8 +22,11 @@ setup_pkg_depends() { _rpkgname="${j%\?*}" _depname="${j#*\?}" if [[ ${_rpkgname} == virtual ]]; then - _pkgname=$(xbps-uhelper getpkgname $_depname 2>/dev/null) - [ -z "$_pkgname" ] && _pkgname="$_depname" + _pkgname="$($XBPS_UHELPER_CMD getpkgdepname ${_depname} 2>/dev/null)" + if [ -z "$_pkgname" ]; then + _pkgname="$($XBPS_UHELPER_CMD getpkgname ${_depname} 2>/dev/null)" + [ -z "$_pkgname" ] && _pkgname="${_depname}" + fi if [ -s ${XBPS_DISTDIR}/etc/virtual ]; then foo=$(grep -E "^${_pkgname}[[:blank:]]" ${XBPS_DISTDIR}/etc/virtual|cut -d ' ' -f2) elif [ -s ${XBPS_DISTDIR}/etc/defaults.virtual ]; then From 9b415c198a196dcde7f249c0cf5c96b4355c75ef Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 31 Mar 2024 11:53:23 -0400 Subject: [PATCH 2/9] dracut: provide initramfs-generator --- srcpkgs/dracut/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 313e2d98719358..d8a72861539d29 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut version=059 -revision=7 +revision=8 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf" @@ -19,6 +19,7 @@ alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm " +provides="initramfs-generator-1_1" subpackages="dracut-network" # Checks require distfiles come from a git repository make_check=no From d742fe340be1410f2a44aca1a28a1b2c0d0f517a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 31 Mar 2024 11:53:23 -0400 Subject: [PATCH 3/9] mkinitcpio: provide initramfs-generator --- srcpkgs/mkinitcpio/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template index edb7f7a035a1d1..9182ac4606fdf4 100644 --- a/srcpkgs/mkinitcpio/template +++ b/srcpkgs/mkinitcpio/template @@ -1,7 +1,7 @@ # Template file for 'mkinitcpio' pkgname=mkinitcpio version=38.1 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="asciidoc" depends="busybox-static bsdtar bash zstd" @@ -18,6 +18,7 @@ alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/mkinitcpio/kernel-hook-postinst initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/mkinitcpio/kernel-hook-postrm " +provides="initramfs-generator-1_1" replaces="mkinitcpio-udev>=0" make_dirs="/etc/mkinitcpio.conf.d 0755 root root" From 083e1049edb88d67ba41938786e8c52f45244ee5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 31 Mar 2024 11:53:24 -0400 Subject: [PATCH 4/9] tinyramfs: provide initramfs-generator --- srcpkgs/tinyramfs/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/tinyramfs/template b/srcpkgs/tinyramfs/template index 2e82a71f47704b..451f82045c109b 100644 --- a/srcpkgs/tinyramfs/template +++ b/srcpkgs/tinyramfs/template @@ -1,7 +1,7 @@ # Template file for 'tinyramfs' pkgname=tinyramfs version=0.1.0 -revision=1 +revision=2 build_style=gnu-makefile depends="util-linux cpio binutils kmod" short_desc="Tiny initramfs written in POSIX shell" @@ -14,6 +14,7 @@ alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/tinyramfs/kernel-hook-postinst initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/tinyramfs/kernel-hook-postrm " +provides="initramfs-generator-0_1" make_check=no # checking requires qemu, locally this still fails conf_files="/etc/tinyramfs/config" From f5ea42060b301ea09ad43359987e91d18f1fbf7e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 31 Mar 2024 11:54:17 -0400 Subject: [PATCH 5/9] etc/defaults.virtual: default initramfs-generator is dracut --- etc/defaults.virtual | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/defaults.virtual b/etc/defaults.virtual index dcd1d35ee51fed..138abf6a8c7d8d 100644 --- a/etc/defaults.virtual +++ b/etc/defaults.virtual @@ -40,3 +40,4 @@ libGL libglvnd libEGL libglvnd libGLES libglvnd hunspell-en_GB hunspell-en_GB-all +initramfs-generator dracut From dfd7ad2b2e550d4a67d163f9768bccce4f2d6dfd Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 31 Mar 2024 11:54:08 -0400 Subject: [PATCH 6/9] linux-base: depend on initramfs-generator --- srcpkgs/linux-base/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template index d04e7ad12bb69c..7acc4982424bfe 100644 --- a/srcpkgs/linux-base/template +++ b/srcpkgs/linux-base/template @@ -1,7 +1,7 @@ # Template file for 'linux-base' pkgname=linux-base version=2023.05.29 -revision=1 +revision=2 short_desc="Linux kernel base dependencies" maintainer="Érico Nogueira " license="Public Domain" @@ -9,10 +9,10 @@ homepage="https://voidlinux.org/" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) - depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut" + depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network virtual?initramfs-generator" ;; ppc*|armv7l*|aarch64*) - depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut" + depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network virtual?initramfs-generator" ;; esac From ce06e85c97bcb3c4568aec92baf2916566a7d5c1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 31 Mar 2024 11:54:08 -0400 Subject: [PATCH 7/9] pinebookpro-base: depend on initramfs-generator --- srcpkgs/pinebookpro-base/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pinebookpro-base/template b/srcpkgs/pinebookpro-base/template index 3bbfd7b3e8d257..ae179f19f60307 100644 --- a/srcpkgs/pinebookpro-base/template +++ b/srcpkgs/pinebookpro-base/template @@ -1,10 +1,10 @@ # Template file for 'pinebookpro-base' pkgname=pinebookpro-base version=0.5 -revision=1 +revision=2 archs="aarch64*" build_style=meta -depends="pinebookpro-kernel dracut pinebookpro-firmware pinebookpro-uboot +depends="pinebookpro-kernel virtual?initramfs-generator pinebookpro-firmware pinebookpro-uboot alsa-ucm-conf" short_desc="Void Linux Pinebook Pro platform package" maintainer="Cameron Nemo " From e2f4beab2dca68fe0bdd3554522fe8d0127a9f75 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 31 Mar 2024 11:54:09 -0400 Subject: [PATCH 8/9] rock64-base: depend on initramfs-generator --- srcpkgs/rock64-base/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rock64-base/template b/srcpkgs/rock64-base/template index 6f885e79783f3e..6243798f244473 100644 --- a/srcpkgs/rock64-base/template +++ b/srcpkgs/rock64-base/template @@ -1,11 +1,11 @@ # Template file for 'rock64-base' pkgname=rock64-base version=0.1 -revision=1 +revision=2 archs="aarch64*" build_style=meta # Linux 5.10 used for USB3 support and stability -depends="rock64-uboot u-boot-menu linux5.10 dracut" +depends="rock64-uboot u-boot-menu linux5.10 virtual?initramfs-generator" short_desc="Void Linux Rock64 platform package" maintainer="Cameron Nemo " license="Public Domain" From e54c026ccec4751265c346df4be36c01d93a1d38 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 31 Mar 2024 11:54:09 -0400 Subject: [PATCH 9/9] zfsbootmenu: depend on initramfs-generator --- srcpkgs/zfsbootmenu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template index 85483ff201c07a..ba736029e9b521 100644 --- a/srcpkgs/zfsbootmenu/template +++ b/srcpkgs/zfsbootmenu/template @@ -1,10 +1,10 @@ # Template file for 'zfsbootmenu' pkgname=zfsbootmenu version=2.3.0 -revision=2 +revision=3 build_style=gnu-makefile make_build_target="zbm-release" -depends="dracut zfs kexec-tools fzf bash pigz mbuffer ncurses +depends="virtual?initramfs-generator>=1 zfs kexec-tools fzf bash pigz mbuffer ncurses perl-Sort-Versions perl-boolean perl-YAML-PP" short_desc="ZFS bootloader for root-on-ZFS systems" maintainer="Zach Dykstra "