diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-04-28 15:21:15 +0200 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2024-04-28 16:20:58 +0200 |
| commit | b2173f50dc7fb21fe7981e703c140f673d8dcd07 (patch) | |
| tree | 806e16077fc3872d896077ffebb17c288ea6ddb7 /mkosi.images | |
| parent | various: drop unnecessary DISABLE_WARNING_FORMAT_NONLITERAL (diff) | |
| download | systemd-b2173f50dc7fb21fe7981e703c140f673d8dcd07.tar.xz systemd-b2173f50dc7fb21fe7981e703c140f673d8dcd07.zip | |
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.
Diffstat (limited to 'mkosi.images')
| -rwxr-xr-x | mkosi.images/system/mkosi.conf.d/10-arch/mkosi.prepare | 2 |
1 files changed, 1 insertions, 1 deletions
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 8ed5c7531c..58930c250a 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 |