diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-01 10:50:46 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-01 10:50:46 -0300 |
commit | 3aff11a8581ae7e5a8ccea02062cd92f873c44c5 (patch) | |
tree | 05623159a5ae88f6eed2414db216bc9a0d2d71c5 /core/systemd/PKGBUILD | |
parent | d4157e6db6dd7e03802aa9c361a1902e81c2545a (diff) | |
parent | 9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/geany/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/cpupower.conf
community/linux-tools/cpupower.rc
community/stk/PKGBUILD
core/patch/PKGBUILD
core/systemd/PKGBUILD
extra/lftp/PKGBUILD
extra/lftp/lftp-4.3.8-gets.patch
extra/mysql/PKGBUILD
extra/qt/PKGBUILD
extra/transmission/PKGBUILD
gnome-unstable/gcr/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/libgdata/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/pango/PKGBUILD
gnome-unstable/polkit/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/wine/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/libusbx/PKGBUILD
testing/systemd/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'core/systemd/PKGBUILD')
-rw-r--r-- | core/systemd/PKGBUILD | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 9e8841aee..1c826da58 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,27 +3,30 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=189 -pkgrel=4 +pkgver=193 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' - 'pam' 'xz') + 'pam' 'quota-tools' 'xz') +checkdepends=('python') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' + '0001-tmpfiles-restore-previous-behavior-for-F-f.patch' 'use-split-usr-path.patch') -md5sums=('ac2eb313f5dce79622f60aac56bca66d' +md5sums=('732a9de2b1d2a15cab639c987ff9e90e' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - '482dba45a783f06c2239f1355f4ce72f') + '1f435290db227c3a4f4396f86819227e' + 'fd5b5f04ab0a847373d357555129d4c0') build() { cd "$pkgname-$pkgver" @@ -34,6 +37,9 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" + # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0 + patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch" + ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -49,6 +55,10 @@ build() { make } +check() { + make -C "$pkgname-$pkgver" check +} + package_systemd() { pkgdesc="system and service manager" depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' @@ -60,7 +70,8 @@ package_systemd() { 'python2-cairo: systemd-analyze' 'python2-dbus: systemd-analyze' 'systemd-sysvcompat: symlink package to provide sysvinit binaries' - 'cryptsetup: required for encrypted block devices') + 'cryptsetup: required for encrypted block devices' + 'quota-tools: kernel-level quota management') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf @@ -130,9 +141,14 @@ package_systemd() { package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit') + conflicts=('sysvinit' 'initscripts') depends=('sysvinit-tools') + # the initscripts conflict here isn't actually needed, but in order to make + # this package remove both sysvinit and initscripts, the initscripts conflict + # is needed. There's no case in which you would ever want initscripts installed + # without sysvinit, and vice versa, as in both cases, they are unusable. + mv "$srcdir/_sysvcompat"/* "$pkgdir" install -dm755 "$pkgdir/sbin" |