Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
systemd
Commits:
d74b24c7 by Joe Konno at 2024-06-29T22:30:59+02:00
meson options: vcs-tag=false
PKGBUILD clones the systemd repository instead of fetching a release
tarball. When built in a repository, git-describe output, complete with
a '^' dirty mark, is appended to the systemd version string by default.
The '^' dirty mark, in particular, can be problematic for tools that
(attempt to) parse the systemd version string. I ran into this problem
running `mkosi`, which does not function with a dirty systemd version
string formatted as such.
Before:
/usr/lib/systemd/systemd --version | head -n 1
systemd 256 (256.1-1-arch-g34ba18b^)
After:
LD_LIBRARY_PATH=$PWD/pkg/systemd/usr/lib/systemd
./pkg/systemd/usr/lib/systemd/systemd --version | head -n 1
systemd 256 (256.1-2-arch)
Signed-off-by: Joe Konno <[email protected]>
- - - - -
1 changed file:
- PKGBUILD
Changes:
=====================================
PKGBUILD
=====================================
@@ -67,12 +67,14 @@
sha512sums=('1ba38dd45cd910c7a2b4c7f23f982c5b0e5b13cd5874571ebc9b609ff85c058cecd
'825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97')
_meson_version="${pkgver}-${pkgrel}"
+_meson_vcs_tag='false'
_meson_mode='release'
_meson_compile=()
_meson_install=()
if ((_systemd_UPSTREAM)); then
_meson_version="${pkgver}"
+ _meson_vcs_tag='true'
_meson_mode='developer'
pkgname+=('systemd-tests')
makedepends+=('libarchive')
@@ -126,6 +128,7 @@ build() {
local _meson_options=(
-Dversion-tag="${_meson_version}-arch"
+ -Dvcs-tag="${_meson_vcs_tag}"
-Dshared-lib-tag="${_meson_version}"
-Dmode="${_meson_mode}"
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/commit/d74b24c7c6077740c35a876445febe6d26bf013c
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/commit/d74b24c7c6077740c35a876445febe6d26bf013c
You're receiving this email because of your account on gitlab.archlinux.org.
