Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
systemd
Commits:
c11626c7 by Daan De Meyer at 2024-02-27T21:36:22+01:00
Adapt to upstream tag naming changes
>From the next release onwards, upstream will start using tildes
instead of hyphens as the tag separator (v256~rc1 instead of v256-rc1)
so let's adapt the PKGBUILD in advance.
- - - - -
cb562cc5 by Christian Hesse at 2024-02-27T21:55:00+01:00
upgpkg: 255.4-1: new upstream release
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,5 +1,5 @@
pkgbase = systemd
- pkgver = 255.3
+ pkgver = 255.4
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
@@ -51,7 +51,7 @@ pkgbase = systemd
makedepends = qrencode
makedepends = lib32-gcc-libs
makedepends = python-pefile
- source =
git+https://github.com/systemd/systemd-stable#tag=8cf1da1e9172ba04d90a483a63118873343ea656?signed
+ source =
git+https://github.com/systemd/systemd-stable#tag=4003dd6754e3446691402d3cc389fbfd4faccc90?signed
source = git+https://github.com/systemd/systemd#tag=v255?signed
source = 0001-Use-Arch-Linux-device-access-groups.patch
source = initcpio-hook-udev
@@ -153,8 +153,8 @@ pkgname = systemd
optdepends = libp11-kit: support PKCS#11
optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
provides = nss-myhostname
- provides = systemd-tools=255.3
- provides = udev=255.3
+ provides = systemd-tools=255.4
+ provides = udev=255.4
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
=====================================
PKGBUILD
=====================================
@@ -6,9 +6,16 @@ pkgname=('systemd'
'systemd-resolvconf'
'systemd-sysvcompat'
'systemd-ukify')
-_tag='8cf1da1e9172ba04d90a483a63118873343ea656' # git rev-parse v${_tag_name}
-_tag_name=255.3
-pkgver="${_tag_name/-/}"
+_tag='4003dd6754e3446691402d3cc389fbfd4faccc90' # git rev-parse v${_tag_name}
+_tag_name=255.4
+# Upstream versioning is incompatible with pacman's version comparisons so we
+# replace tildes with the empty string to make sure pacman's version comparing
+# does the right thing for rc versions:
+# ➜ vercmp 255~rc1 255
+# 1
+# ➜ vercmp 255rc1 255
+# -1
+pkgver="${_tag_name/~/}"
pkgrel=1
arch=('x86_64')
license=('LGPL-2.1-or-later')
@@ -116,9 +123,9 @@ build() {
)
local _meson_options=(
- # internal version comparison is incompatible with pacman:
- # 249~rc1 < 249 < 249.1 < 249rc
- -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-arch"
+ -Dversion-tag="${_tag_name}-${pkgrel}-arch"
+ # We use the version without tildes as the shared library tag because
+ # pacman looks at the shared library version.
-Dshared-lib-tag="${pkgver}-${pkgrel}"
-Dmode=release
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/compare/af20d82a235c8d1100f0403041128dde11042d2b...cb562cc55febc2b21659477c8839b475959c7cbf
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/compare/af20d82a235c8d1100f0403041128dde11042d2b...cb562cc55febc2b21659477c8839b475959c7cbf
You're receiving this email because of your account on gitlab.archlinux.org.
