shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

mkosi: Ignore version from versioned dependencies in .SRCINFO

Browse Source 
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.
This commit is contained in:
Daan De Meyer 2024-04-28 15:21:15 +02:00 committed by Luca Boccassi
parent 39a8ef05cd
commit b2173f50dc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkosi.images/system/mkosi.conf.d/10-arch/mkosi.prepare
View File

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

2
pkg/arch

@ -1 +1 @@
Subproject commit 124b1da79088d0f0ab33dc2d840d4733074dbf64
Subproject commit 6a2bc5773a560688e6c12ab4bcfec87df6092ec1