summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Down2019-09-25 16:33:17 +0100
committerChris Down2019-09-25 16:33:17 +0100
commit2751df2badb565b721b8749b6fa32e46fa03e210 (patch)
tree85c5caa23b7f46a6c172f9d37869f7a353cf20ae
parent345301e8bcd4b38bd621138b82008c0f20f6f46b (diff)
downloadaur-2751df2badb565b721b8749b6fa32e46fa03e210.tar.gz
upgpkg: systemd-cdown-git 243.r129.g82d1264048-1
-rw-r--r--.SRCINFO76
-rw-r--r--20-systemd-sysusers.hook (renamed from systemd-sysusers.hook)0
-rw-r--r--30-systemd-binfmt.hook (renamed from systemd-binfmt.hook)0
-rw-r--r--30-systemd-catalog.hook (renamed from systemd-catalog.hook)0
-rw-r--r--30-systemd-daemon-reload.hook (renamed from systemd-daemon-reload.hook)0
-rw-r--r--30-systemd-hwdb.hook (renamed from systemd-hwdb.hook)0
-rw-r--r--30-systemd-sysctl.hook (renamed from systemd-sysctl.hook)0
-rw-r--r--30-systemd-tmpfiles.hook (renamed from systemd-tmpfiles.hook)0
-rw-r--r--30-systemd-udev-reload.hook (renamed from systemd-udev-reload.hook)0
-rw-r--r--30-systemd-update.hook (renamed from systemd-update.hook)0
-rw-r--r--PKGBUILD114
-rw-r--r--README5
-rw-r--r--systemd-hook9
-rw-r--r--systemd.install10
14 files changed, 114 insertions, 100 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f7758dcc911..5369f779d7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = systemd-cdown-git
- pkgdesc = systemd (cdown git version)
- pkgver = 235.7842
+ pkgdesc = systemd (git version)
+ pkgver = 243.r129.g82d1264048
pkgrel = 1
- url = https://www.github.com/cdown/systemd
+ url = https://www.github.com/systemd/systemd
arch = x86_64
makedepends = acl
makedepends = cryptsetup
@@ -34,9 +34,7 @@ pkgbase = systemd-cdown-git
makedepends = kexec-tools
makedepends = libxkbcommon
makedepends = bash-completion
- options = strip
- options = !distcc
- options = !ccache
+ options = !strip
source = git+https://github.com/cdown/systemd#branch=cdowntest
source = 0001-Use-Arch-Linux-device-access-groups.patch
source = initcpio-hook-udev
@@ -47,15 +45,15 @@ pkgbase = systemd-cdown-git
source = splash-arch.bmp::https://git.archlinux.org/svntogit/packages.git/plain/trunk/splash-arch.bmp?h=packages/systemd
source = systemd-user.pam
source = systemd-hook
- source = systemd-binfmt.hook
- source = systemd-catalog.hook
- source = systemd-daemon-reload.hook
- source = systemd-hwdb.hook
- source = systemd-sysctl.hook
- source = systemd-sysusers.hook
- source = systemd-tmpfiles.hook
- source = systemd-udev-reload.hook
- source = systemd-update.hook
+ source = 20-systemd-sysusers.hook
+ source = 30-systemd-binfmt.hook
+ source = 30-systemd-catalog.hook
+ source = 30-systemd-daemon-reload.hook
+ source = 30-systemd-hwdb.hook
+ source = 30-systemd-sysctl.hook
+ source = 30-systemd-tmpfiles.hook
+ source = 30-systemd-udev-reload.hook
+ source = 30-systemd-update.hook
sha512sums = SKIP
sha512sums = 9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e
sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
@@ -65,13 +63,13 @@ pkgbase = systemd-cdown-git
sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19
- sha512sums = 6b82386fc20619eefa911cd9cdac8efbd0c7137bba4955e8ae75a0ea378d19dbfccc1f7bde6684f03e5f2badefa4abf20623153d88a170d14499167319586db7
+ sha512sums = 869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323
+ sha512sums = 08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763
sha512sums = 5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8
sha512sums = 4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb
sha512sums = 872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2
sha512sums = 471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d
sha512sums = da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a
- sha512sums = 08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763
sha512sums = 577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447
sha512sums = e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2
sha512sums = 209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67
@@ -91,8 +89,9 @@ pkgname = systemd-cdown-git
depends = hwids
depends = libcap
depends = libgcrypt
- depends = libsystemd
+ depends = systemd-cdown-libs
depends = libidn2
+ depends = libidn2.so
depends = lz4
depends = pam
depends = libelf
@@ -103,20 +102,19 @@ pkgname = systemd-cdown-git
depends = audit
optdepends = libmicrohttpd: remote journald capabilities
optdepends = quota-tools: kernel-level quota management
- optdepends = systemd-sysvcompat-cdown-git: symlink package to provide sysvinit binaries
+ optdepends = systemd-cdown-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=235.7842
+ provides = systemd=243.r129.g82d1264048
provides = nss-myhostname
- provides = systemd-tools=235.7842
- provides = udev=235.7842
+ provides = systemd-cdown-tools=243.r129.g82d1264048
+ provides = udev=243.r129.g82d1264048
conflicts = systemd
conflicts = nss-myhostname
- conflicts = systemd-tools
+ conflicts = systemd-cdown-tools
conflicts = udev
- replaces = systemd
replaces = nss-myhostname
- replaces = systemd-tools
+ replaces = systemd-cdown-tools
replaces = udev
backup = etc/pam.d/systemd-user
backup = etc/systemd/coredump.conf
@@ -124,43 +122,45 @@ pkgname = systemd-cdown-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
-pkgname = libsystemd-cdown-git
+pkgname = systemd-cdown-libs-git
pkgdesc = systemd client libraries (git version)
- license = GPL2
+ license = LGPL2.1
depends = glibc
depends = libcap
depends = libgcrypt
depends = lz4
depends = xz
+ provides = systemd-cdown-libs
provides = libsystemd
provides = libsystemd.so
provides = libudev.so
+ conflicts = systemd-cdown-libs
conflicts = libsystemd
replaces = libsystemd
-pkgname = systemd-resolvconf-cdown-git
- pkgdesc = systemd resolvconf replacement (git version)
- license = GPL2
+pkgname = systemd-cdown-resolvconf-git
+ pkgdesc = systemd resolvconf replacement (for use with systemd-resolved, git version)
+ license = LGPL2.1
depends = systemd-cdown-git
- provides = systemd-resolvconf
+ provides = systemd-cdown-resolvconf
provides = openresolv
provides = resolvconf
- conflicts = systemd-resolvconf
+ conflicts = systemd-cdown-resolvconf
conflicts = openresolv
- replaces = systemd-resolvconf
-pkgname = systemd-sysvcompat-cdown-git
+pkgname = systemd-cdown-sysvcompat-git
pkgdesc = sysvinit compat for systemd (git version)
license = GPL2
depends = systemd-cdown-git
- provides = systemd-sysvcompat
- conflicts = systemd-sysvcompat
+ provides = systemd-cdown-sysvcompat
+ conflicts = systemd-cdown-sysvcompat
conflicts = sysvinit
- replaces = systemd-sysvcompat
diff --git a/systemd-sysusers.hook b/20-systemd-sysusers.hook
index 9873dd40201..9873dd40201 100644
--- a/systemd-sysusers.hook
+++ b/20-systemd-sysusers.hook
diff --git a/systemd-binfmt.hook b/30-systemd-binfmt.hook
index 9c31a4b162c..9c31a4b162c 100644
--- a/systemd-binfmt.hook
+++ b/30-systemd-binfmt.hook
diff --git a/systemd-catalog.hook b/30-systemd-catalog.hook
index d28bddc4bbc..d28bddc4bbc 100644
--- a/systemd-catalog.hook
+++ b/30-systemd-catalog.hook
diff --git a/systemd-daemon-reload.hook b/30-systemd-daemon-reload.hook
index 87923e86266..87923e86266 100644
--- a/systemd-daemon-reload.hook
+++ b/30-systemd-daemon-reload.hook
diff --git a/systemd-hwdb.hook b/30-systemd-hwdb.hook
index f0440b0a645..f0440b0a645 100644
--- a/systemd-hwdb.hook
+++ b/30-systemd-hwdb.hook
diff --git a/systemd-sysctl.hook b/30-systemd-sysctl.hook
index aec5ac1b0e8..aec5ac1b0e8 100644
--- a/systemd-sysctl.hook
+++ b/30-systemd-sysctl.hook
diff --git a/systemd-tmpfiles.hook b/30-systemd-tmpfiles.hook
index df60d82752e..df60d82752e 100644
--- a/systemd-tmpfiles.hook
+++ b/30-systemd-tmpfiles.hook
diff --git a/systemd-udev-reload.hook b/30-systemd-udev-reload.hook
index 04238bd58d3..04238bd58d3 100644
--- a/systemd-udev-reload.hook
+++ b/30-systemd-udev-reload.hook
diff --git a/systemd-update.hook b/30-systemd-update.hook
index 7084a0c161c..7084a0c161c 100644
--- a/systemd-update.hook
+++ b/30-systemd-update.hook
diff --git a/PKGBUILD b/PKGBUILD
index 9fa11d0cfe5..821e6d2f0c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,19 +5,19 @@
pkgbase=systemd-cdown-git
_pkgbase=systemd
-pkgname=('systemd-cdown-git' 'libsystemd-cdown-git' 'systemd-resolvconf-cdown-git' 'systemd-sysvcompat-cdown-git')
-pkgdesc="systemd (cdown git version)"
-pkgver=235.7842
+pkgname=('systemd-cdown-git' 'systemd-cdown-libs-git' 'systemd-cdown-resolvconf-git' 'systemd-cdown-sysvcompat-git')
+pkgdesc="systemd (git version)"
+pkgver=243.r129.g82d1264048
pkgrel=1
arch=('x86_64')
-url='https://www.github.com/cdown/systemd'
+url='https://www.github.com/systemd/systemd'
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
'bash-completion')
-options=('strip' '!distcc' '!ccache')
+options=('!strip')
source=('git+https://github.com/cdown/systemd#branch=cdowntest'
'0001-Use-Arch-Linux-device-access-groups.patch'
'initcpio-hook-udev'
@@ -28,15 +28,15 @@ source=('git+https://github.com/cdown/systemd#branch=cdowntest'
'splash-arch.bmp'::'https://git.archlinux.org/svntogit/packages.git/plain/trunk/splash-arch.bmp?h=packages/systemd'
'systemd-user.pam'
'systemd-hook'
- 'systemd-binfmt.hook'
- 'systemd-catalog.hook'
- 'systemd-daemon-reload.hook'
- 'systemd-hwdb.hook'
- 'systemd-sysctl.hook'
- 'systemd-sysusers.hook'
- 'systemd-tmpfiles.hook'
- 'systemd-udev-reload.hook'
- 'systemd-update.hook')
+ '20-systemd-sysusers.hook'
+ '30-systemd-binfmt.hook'
+ '30-systemd-catalog.hook'
+ '30-systemd-daemon-reload.hook'
+ '30-systemd-hwdb.hook'
+ '30-systemd-sysctl.hook'
+ '30-systemd-tmpfiles.hook'
+ '30-systemd-udev-reload.hook'
+ '30-systemd-update.hook')
sha512sums=('SKIP'
'9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
@@ -46,13 +46,13 @@ sha512sums=('SKIP'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
- '6b82386fc20619eefa911cd9cdac8efbd0c7137bba4955e8ae75a0ea378d19dbfccc1f7bde6684f03e5f2badefa4abf20623153d88a170d14499167319586db7'
+ '869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323'
+ '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
'5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
'4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
'872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
'471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d'
'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
- '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
'577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2'
'209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
@@ -64,13 +64,9 @@ prepare() {
}
pkgver() {
- local version count
-
cd "$_pkgbase"
-
- version="$(git describe --abbrev=0 --tags)"
- count="$(git rev-list --count ${version}..)"
- printf '%s.%s' "${version#v}" "${count}"
+ # cutting off 'foo-' prefix that presents in the git tag
+ git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
@@ -90,10 +86,13 @@ build() {
)
local _meson_options=(
+ -Dversion-tag="${pkgver}-${pkgrel}-arch"
+
-Dgnu-efi=true
-Dima=false
-Dlibidn2=true
-Dlz4=true
+ -Dman=true
-Ddbuspolicydir=/usr/share/dbus-1/system.d
-Ddefault-hierarchy=hybrid
@@ -106,28 +105,28 @@ build() {
-Dsysvinit-path=
-Dsysvrcnd-path=
)
-
+
arch-meson "$_pkgbase" build "${_meson_options[@]}"
ninja -C build
}
-# check() {
-# meson test -C build
-# }
+check() {
+ meson test -C build
+}
package_systemd-cdown-git() {
pkgdesc="system and service manager (git version)"
license=('GPL2' 'LGPL2.1')
depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
- 'libgcrypt' 'libsystemd' 'libidn2' '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')
- conflicts=("${_pkgbase}" 'nss-myhostname' 'systemd-tools' 'udev')
+ 'libgcrypt' 'systemd-cdown-libs' 'libidn2' 'libidn2.so' 'lz4' 'pam' 'libelf'
+ 'libseccomp' 'util-linux' 'xz' 'pcre2' 'audit')
+ provides=("${_pkgbase}=$pkgver" 'nss-myhostname' "systemd-cdown-tools=$pkgver" "udev=$pkgver")
+ replaces=('nss-myhostname' 'systemd-cdown-tools' 'udev')
+ conflicts=("${_pkgbase}" 'nss-myhostname' 'systemd-cdown-tools' 'udev')
optdepends=('libmicrohttpd: remote journald capabilities'
'quota-tools: kernel-level quota management'
- 'systemd-sysvcompat-cdown-git: symlink package to provide sysvinit binaries'
+ 'systemd-cdown-sysvcompat-git: symlink package to provide sysvinit binaries'
'polkit: allow administration as unprivileged user'
'curl: machinectl pull-tar and pull-raw')
backup=(etc/pam.d/systemd-user
@@ -136,25 +135,23 @@ package_systemd-cdown-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
DESTDIR="$pkgdir" meson install -C build
- # don't write units to /etc by default. some of these will be re-enabled on
- # post_install.
- rm -rv "$pkgdir"/etc/systemd/system/*
-
# we'll create this on installation
rmdir "$pkgdir"/var/log/journal/remote
- # runtime libraries shipped with libsystemd
- install -d -m0755 libsystemd
- mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* libsystemd
+ # runtime libraries shipped with systemd-libs
+ install -d -m0755 systemd-libs
+ mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs
# manpages shipped with systemd-sysvcompat
rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8
@@ -166,11 +163,12 @@ package_systemd-cdown-git() {
rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
# avoid a potential conflict with [core]/filesystem
- rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf
- sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
+ rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf}
+ sed -i -e '/^C \/etc\/nsswitch\.conf/d' \
+ -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
# add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat
- install -m0644 $_pkgbase/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d
+ install -m0644 "$_pkgbase"/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d
# ship default policy to leave services disabled
echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
@@ -202,25 +200,24 @@ package_systemd-cdown-git() {
install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user
}
-package_libsystemd-cdown-git() {
- pkgdesc="systemd client libraries (git version)"
+package_systemd-cdown-libs-git() {
+ pkgdesc='systemd client libraries (git version)'
depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
- license=('GPL2')
- provides=('libsystemd' 'libsystemd.so' 'libudev.so')
+ license=('LGPL2.1')
+ provides=('systemd-cdown-libs' 'libsystemd' 'libsystemd.so' 'libudev.so')
+ conflicts=('systemd-cdown-libs' 'libsystemd')
replaces=('libsystemd')
- conflicts=('libsystemd')
install -d -m0755 "$pkgdir"/usr
- mv libsystemd "$pkgdir"/usr/lib
+ mv systemd-libs "$pkgdir"/usr/lib
}
-package_systemd-resolvconf-cdown-git() {
- pkgdesc='systemd resolvconf replacement (git version)'
- license=('GPL2')
+package_systemd-cdown-resolvconf-git() {
+ pkgdesc='systemd resolvconf replacement (for use with systemd-resolved, git version)'
+ license=('LGPL2.1')
depends=("${pkgbase}")
- provides=('systemd-resolvconf' 'openresolv' 'resolvconf')
- replaces=('systemd-resolvconf')
- conflicts=('systemd-resolvconf' 'openresolv')
+ provides=('systemd-cdown-resolvconf' 'openresolv' 'resolvconf')
+ conflicts=('systemd-cdown-resolvconf' 'openresolv')
install -d -m0755 "$pkgdir"/usr/bin
ln -s resolvectl "$pkgdir"/usr/bin/resolvconf
@@ -230,13 +227,12 @@ package_systemd-resolvconf-cdown-git() {
}
-package_systemd-sysvcompat-cdown-git() {
+package_systemd-cdown-sysvcompat-git() {
pkgdesc='sysvinit compat for systemd (git version)'
license=('GPL2')
- provides=('systemd-sysvcompat')
- replaces=('systemd-sysvcompat')
- conflicts=('systemd-sysvcompat' 'sysvinit')
depends=("${pkgbase}")
+ provides=('systemd-cdown-sysvcompat')
+ conflicts=('systemd-cdown-sysvcompat' 'sysvinit')
install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \
build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
diff --git a/README b/README
index a7c263ba41f..c08d1b0cab3 100644
--- a/README
+++ b/README
@@ -1,4 +1,7 @@
This is *usually* the same as systemd-git, except for when I have patches
pending, in which case my dogfooding branch also contains those.
-s/-git/-cdown-git/ and changing the URL is most of the work.
+---
+
+1. change pkgname array + functions + depends/provides/etc (%s/systemd-/systemd-cdown-/gc)
+2. change git url
diff --git a/systemd-hook b/systemd-hook
index 0a664f2c582..6f2e899234c 100644
--- a/systemd-hook
+++ b/systemd-hook
@@ -14,7 +14,9 @@ udevd_live() {
fi
}
-case $1 in
+op="$1"; shift
+
+case "$op" in
catalog) /usr/bin/journalctl --update-catalog ;;
hwdb) /usr/bin/systemd-hwdb --usr update ;;
update) touch -c /usr ;;
@@ -26,7 +28,10 @@ case $1 in
binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;;
sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;;
- *) echo >&2 " Invalid operation '$1'"; exit 1 ;;
+ # For use by other packages
+ reload) systemd_live; /usr/bin/systemctl try-reload-or-restart "$@" ;;
+
+ *) echo >&2 " Invalid operation '$op'"; exit 1 ;;
esac
exit 0
diff --git a/systemd.install b/systemd.install
index fedc747ea6e..417110181c5 100644
--- a/systemd.install
+++ b/systemd.install
@@ -53,6 +53,15 @@ _233_75_3_changes() {
fi
}
+_242_0_2_changes() {
+ if [[ -L var/lib/systemd/timesync ]]; then
+ rm var/lib/systemd/timesync
+ if [[ -d var/lib/private/systemd/timesync ]]; then
+ mv var/lib/{private/,}systemd/timesync
+ fi
+ fi
+}
+
post_install() {
systemd-machine-id-setup
@@ -87,6 +96,7 @@ post_upgrade() {
230-1
232-8
233.75-3
+ 242.0-2
)
for v in "${upgrades[@]}"; do