summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2019-02-28 08:09:12 +0100
committerYurii Kolesnykov2019-02-28 08:09:12 +0100
commitcd3bcfeb957d63a2c1f6ec46ac0b56ea74ff0309 (patch)
tree921183bbcb8a4113f570c0624019b35c1dd914ea
parent14f03ee424da9d464a957fb15a02c13275270b42 (diff)
downloadaur-cd3bcfeb957d63a2c1f6ec46ac0b56ea74ff0309.tar.gz
241.338
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD14
2 files changed, 15 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 707fdc32d05..b81c67150d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-git
pkgdesc = systemd (git version)
- pkgver = 241.318
+ pkgver = 241.338
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
@@ -107,15 +107,14 @@ pkgname = systemd-git
optdepends = systemd-sysvcompat-git: symlink package to provide sysvinit binaries
optdepends = polkit: allow administration as unprivileged user
optdepends = curl: machinectl pull-tar and pull-raw
- provides = systemd=241.318
+ provides = systemd=241.338
provides = nss-myhostname
- provides = systemd-tools=241.318
- provides = udev=241.318
+ provides = systemd-tools=241.338
+ provides = udev=241.338
conflicts = systemd
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
- replaces = systemd
replaces = nss-myhostname
replaces = systemd-tools
replaces = udev
@@ -125,9 +124,11 @@ pkgname = systemd-git
backup = etc/systemd/journal-remote.conf
backup = etc/systemd/journal-upload.conf
backup = etc/systemd/logind.conf
+ backup = etc/systemd/networkd.conf
+ backup = etc/systemd/resolved.conf
+ backup = etc/systemd/sleep.conf
backup = etc/systemd/system.conf
backup = etc/systemd/timesyncd.conf
- backup = etc/systemd/resolved.conf
backup = etc/systemd/user.conf
backup = etc/udev/udev.conf
@@ -145,7 +146,6 @@ pkgname = systemd-libs-git
provides = libudev.so
conflicts = systemd-libs
conflicts = libsystemd
- replaces = systemd-libs
replaces = libsystemd
pkgname = systemd-resolvconf-git
@@ -157,7 +157,6 @@ pkgname = systemd-resolvconf-git
provides = resolvconf
conflicts = systemd-resolvconf
conflicts = openresolv
- replaces = systemd-resolvconf
pkgname = systemd-sysvcompat-git
pkgdesc = sysvinit compat for systemd (git version)
@@ -166,5 +165,4 @@ pkgname = systemd-sysvcompat-git
provides = systemd-sysvcompat
conflicts = systemd-sysvcompat
conflicts = sysvinit
- replaces = systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index 7c976d97670..bd2835fea61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=systemd-git
_pkgbase=systemd
pkgname=('systemd-git' 'systemd-libs-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git')
pkgdesc="systemd (git version)"
-pkgver=241.318
+pkgver=241.338
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
@@ -91,6 +91,8 @@ build() {
)
local _meson_options=(
+ -Dversion-tag="${pkgver}-${pkgrel}-git"
+
-Dgnu-efi=true
-Dima=false
-Dlibidn2=true
@@ -124,7 +126,7 @@ package_systemd-git() {
'libgcrypt' 'systemd-libs' 'libidn2' 'libidn2.so' 'lz4' 'pam' 'libelf'
'libseccomp' 'util-linux' 'xz' 'pcre2' 'audit')
provides=("${_pkgbase}=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
- replaces=("${_pkgbase}" 'nss-myhostname' 'systemd-tools' 'udev')
+ replaces=('nss-myhostname' 'systemd-tools' 'udev')
conflicts=("${_pkgbase}" 'nss-myhostname' 'systemd-tools' 'udev')
optdepends=('libmicrohttpd: remote journald capabilities'
'quota-tools: kernel-level quota management'
@@ -137,9 +139,11 @@ package_systemd-git() {
etc/systemd/journal-remote.conf
etc/systemd/journal-upload.conf
etc/systemd/logind.conf
+ etc/systemd/networkd.conf
+ etc/systemd/resolved.conf
+ etc/systemd/sleep.conf
etc/systemd/system.conf
etc/systemd/timesyncd.conf
- etc/systemd/resolved.conf
etc/systemd/user.conf
etc/udev/udev.conf)
install=systemd.install
@@ -209,7 +213,7 @@ package_systemd-libs-git() {
license=('LGPL2.1')
provides=('systemd-libs' 'libsystemd' 'libsystemd.so' 'libudev.so')
conflicts=('systemd-libs' 'libsystemd')
- replaces=('systemd-libs' 'libsystemd')
+ replaces=('libsystemd')
install -d -m0755 "$pkgdir"/usr
mv systemd-libs "$pkgdir"/usr/lib
@@ -221,7 +225,6 @@ package_systemd-resolvconf-git() {
depends=('systemd-git')
provides=('systemd-resolvconf' 'openresolv' 'resolvconf')
conflicts=('systemd-resolvconf' 'openresolv')
- replaces=('systemd-resolvconf')
install -d -m0755 "$pkgdir"/usr/bin
ln -s resolvectl "$pkgdir"/usr/bin/resolvconf
@@ -237,7 +240,6 @@ package_systemd-sysvcompat-git() {
depends=('systemd-git')
provides=('systemd-sysvcompat')
conflicts=('systemd-sysvcompat' 'sysvinit')
- replaces=('systemd-sysvcompat')
install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \
build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8