From 02dfe83c4bb048f770e62a07830cb492e441cf3e Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 10 Jun 2022 15:40:17 -0700 Subject: [PATCH] main/postmarketos-mkinitfs: provide initramfs-generator (MR 3219) Alpine provides a 'initramfs-generator' thing now that the alpine linux-* depend on explicitly. This sets postmarketos-mkinitfs to be the preferred provider of that virtual package. Fixes: ERROR: unable to select packages: postmarketos-mkinitfs-1.4.1-r5: conflicts: mkinitfs-3.6.1-r2[mkinitfs=3.6.0] satisfies: postmarketos-base-20-r1[postmarketos-mkinitfs] postmarketos-base-nofde-20-r1[postmarketos-mkinitfs] .pmbootstrap-20220610.215815[postmarketos-mkinitfs] .pmbootstrap-20220610.215815[mkinitfs] mkinitfs-3.6.1-r2: conflicts: postmarketos-mkinitfs-1.4.1-r5 satisfies: .pmbootstrap-20220610.215815[mkinitfs] linux-rpi-5.15.45-r1[initramfs-generator] .pmbootstrap-20220610.215815: masked in: cache satisfies: world[.pmbootstrap=20220610.215815] Also see: 30d7b88324 (aports) main/mkinitfs: provide initramfs-generator 4fac61c826 (aports) main/linux-lts: replace mkinitfs with initramfs-generator --- main/postmarketos-mkinitfs/APKBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index 2397c2b5c..77cb77ef7 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Clayton Craft pkgname=postmarketos-mkinitfs pkgver=1.4.1 -pkgrel=5 +pkgrel=6 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" depends=" @@ -34,7 +34,8 @@ source=" install="$pkgname.post-upgrade" arch="all" license="GPL-2.0-or-later" -provides="mkinitfs=3.6.0" +provider_priority=999 # higher priority than Alpine's mkinitfs +provides="mkinitfs=3.6.1 initramfs-generator=3.6.1" export GOPATH="$srcdir" export CGO_ENABLED=0