From: Daan De Meyer Date: Sun, 28 Apr 2024 13:21:15 +0000 (+0200) Subject: mkosi: Ignore version from versioned dependencies in .SRCINFO X-Git-Tag: v256-rc2~174 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2173f50dc7fb21fe7981e703c140f673d8dcd07;p=thirdparty%2Fsystemd.git mkosi: Ignore version from versioned dependencies in .SRCINFO Dependencies in .SRCINFO can be versioned. Let's make sure we ignore any specified versions when grepping it for dependencies. Also update the arch submodule to the latest to make sure the change works. --- diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.prepare b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.prepare index 8ed5c7531cb..58930c250a0 100755 --- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.prepare +++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.prepare @@ -17,7 +17,7 @@ fi # We get depends and optdepends from .SRCINFO as getting them from the PKGBUILD is rather complex. sed --expression 's/^[ \t]*//' "pkg/$ID/.SRCINFO" | grep --regexp '^depends =' --regexp '^optdepends =' | - sed --expression 's/^depends = //' --expression 's/^optdepends = //' --expression 's/:.*//' | + sed --expression 's/^depends = //' --expression 's/^optdepends = //' --expression 's/:.*//' --expression 's/=.*//' | xargs --delimiter '\n' mkosi-install # We get makedepends from the PKGBUILD as .SRCINFO can't encode conditional dependencies depending on diff --git a/pkg/arch b/pkg/arch index 124b1da7908..6a2bc5773a5 160000 --- a/pkg/arch +++ b/pkg/arch @@ -1 +1 @@ -Subproject commit 124b1da79088d0f0ab33dc2d840d4733074dbf64 +Subproject commit 6a2bc5773a560688e6c12ab4bcfec87df6092ec1