summaryrefslogtreecommitdiff
path: root/core/systemd
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-07-17 16:14:15 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-07-17 16:14:15 -0300
commit70877cfb7e290449b9f9c660e25345f462576c4c (patch)
tree0f63651432b8448262549265a5420fff1ab665e8 /core/systemd
parent509bf50c73444930b6f57c42678ec22e7de82c88 (diff)
parent412d061bfbf23d1e908eed3f8405b1af46fb1ba8 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/electricsheep/PKGBUILD community-testing/gnash/PKGBUILD community-testing/performous/PKGBUILD community/drbd/PKGBUILD community/oss/PKGBUILD community/pinot/PKGBUILD core/glibc/PKGBUILD core/kmod/PKGBUILD core/pkg-config/PKGBUILD core/systemd/PKGBUILD extra/bitlbee/PKGBUILD extra/mesa/PKGBUILD extra/nettle/PKGBUILD extra/xfce4-netload-plugin/PKGBUILD kde-unstable/kdepim/PKGBUILD multilib/lib32-glibc/PKGBUILD multilib/lib32-mesa/PKGBUILD multilib/lib32-mpg123/PKGBUILD multilib/lib32-nettle/PKGBUILD multilib/lib32-nouveau-dri/PKGBUILD multilib/lib32-pcre/PKGBUILD multilib/lib32-readline/PKGBUILD multilib/zsnes/PKGBUILD multilib/zsnes/zsnes.patch testing/cryptsetup/PKGBUILD testing/ekiga/PKGBUILD testing/iputils/PKGBUILD testing/poppler/PKGBUILD testing/util-linux/PKGBUILD testing/util-linux/util-linux.install
Diffstat (limited to 'core/systemd')
-rw-r--r--core/systemd/PKGBUILD26
1 files changed, 8 insertions, 18 deletions
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 8294cc2fb..3a9ed02b9 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
-pkgver=185
-pkgrel=4
+pkgver=186
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,16 +16,12 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-install-udev'
'initcpio-install-timestamp'
'0001-Reinstate-TIMEOUT-handling.patch'
- '0001-vconsole-setup-enable-utf-8-mode-explicitly.patch'
- '0001-udev-systemd-udev-settle.service-fix-After.patch'
'locale.sh')
-md5sums=('a7dbbf05986eb0d2c164ec8e570eb78f'
+md5sums=('17eff1d31e6e49bf82e129fe57efd59b'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'59e91c4d7a69b7bf12c86a9982e37ced'
'df69615503ad293c9ddf9d8b7755282d'
'5543be25f205f853a21fa5ee68e03f0d'
- '83f51149ff9c4d75ea946e2b3cc61e53'
- 'b3e41e90beaff35c66ba1b4bc223430a'
'f15956945052bb911e5df81cf5e7e5dc')
build() {
@@ -34,12 +30,6 @@ build() {
# still waiting on ipw2x00 to get fixed...
patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
- # upstream commit d305a67b46644d6360ef557109384c831ee8e018
- patch -Np1 <"$srcdir/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch"
-
- # upstream commit 8e8eb8fbafcaa841fa5393e396acde27b26edf2f
- patch -Np1 <"$srcdir/0001-udev-systemd-udev-settle.service-fix-After.patch"
-
./configure \
--libexecdir=/usr/lib \
--localstatedir=/var \
@@ -62,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=('python2-dbus: systemd-analyze'
+ optdepends=('python-dbus: systemd-analyze'
'initscripts: legacy support for hostname and vconsole setup'
'initscripts-systemd: legacy generator for initialization scripts'
- 'python2-cairo: systemd-analyze'
+ 'python-cairo: 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
@@ -86,9 +76,6 @@ package_systemd() {
install -dm755 "$pkgdir/bin"
ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
- # fix systemd-analyze for python2
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
# move bash-completion and symlink for loginctl
install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
"$pkgdir/usr/share/bash-completion/completions/systemctl"
@@ -197,6 +184,9 @@ package_systemd-tools() {
# udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
+ # add back tmpfiles.d/legacy.conf
+ install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+
# Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
s#GROUP="tape"#GROUP="storage"#g;