summaryrefslogtreecommitdiff
path: root/core/systemd
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-07-30 14:59:24 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-07-30 14:59:24 +0200
commit09dd4a97fccc4bcabe341c4e4490004385283e53 (patch)
treed00a22a0304969ff70ecc680f3e89b5fab1ecce6 /core/systemd
parent3a3f329b736af639fdd3c9621816bad627b96903 (diff)
parent4982c269b318734d01ad30c6592fbb73565ceb12 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/gource/PKGBUILD community-staging/performous/PKGBUILD community-staging/wt/PKGBUILD extra/cups/PKGBUILD extra/libwacom/PKGBUILD extra/python-urwid/PKGBUILD multilib/lib32-dbus-core/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-gtk2/PKGBUILD multilib/lib32-mpg123/PKGBUILD multilib/lib32-readline/PKGBUILD staging/hugin/PKGBUILD testing/cups/PKGBUILD testing/cups/cups-no-gzip-man.patch testing/cups/cups-systemd-socket.patch testing/cups/cups.install testing/systemd/PKGBUILD
Diffstat (limited to 'core/systemd')
-rw-r--r--core/systemd/PKGBUILD16
1 files changed, 10 insertions, 6 deletions
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 3a9ed02b9..40cd149bf 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
-pkgver=186
+pkgver=187
pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -17,7 +17,7 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-install-timestamp'
'0001-Reinstate-TIMEOUT-handling.patch'
'locale.sh')
-md5sums=('17eff1d31e6e49bf82e129fe57efd59b'
+md5sums=('26606e3c84448800ef0b3ffd57e6e8b6'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'59e91c4d7a69b7bf12c86a9982e37ced'
'df69615503ad293c9ddf9d8b7755282d'
@@ -52,10 +52,10 @@ package_systemd() {
pkgdesc="system and service manager"
depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam'
"systemd-tools=$pkgver" 'util-linux' 'xz')
- optdepends=('python-dbus: systemd-analyze'
- 'initscripts: legacy support for hostname and vconsole setup'
+ optdepends=('initscripts: legacy support for hostname and vconsole setup'
'initscripts-systemd: legacy generator for initialization scripts'
- 'python-cairo: systemd-analyze'
+ 'python2-cairo: systemd-analyze'
+ 'python2-dbus: systemd-analyze'
'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
'systemd-sysvcompat: symlink package to provide sysvinit binaries')
backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
@@ -87,6 +87,10 @@ package_systemd() {
rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
+ # fix systemd-analyze for python2. the 'plot' verb does not work
+ # with py3k due to a bug in python-cairo
+ sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
### split off libsystemd (libs, includes, pkgconfig, man3)
rm -rf "$srcdir/_libsystemd"
install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig}
@@ -137,7 +141,7 @@ package_systemd() {
mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8
mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1
mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
- mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5
+ mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5
mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd
}