diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
commit | c6e5d0d788ee2654a67bac4429d92f1f1df64c69 (patch) | |
tree | 84d3087e9c9f9aab24d69f83c8e7d1d7bde8dd17 /core/systemd/PKGBUILD | |
parent | 89bffd8b9efae5fd29ca78a4741839ca68eb108f (diff) | |
parent | bc83221d3c667b70e51dfff6ed212aada3906ee6 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kid3/kid3.install
community/cherokee/PKGBUILD
community/supercollider/supercollider.install
core/libusb/PKGBUILD
core/systemd/PKGBUILD
core/udev/PKGBUILD
extra/gimp-devel/PKGBUILD
extra/maxima/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
staging/kdebase-workspace/kdm
staging/kdebindings-perlkde/PKGBUILD
staging/kdebindings-perlqt/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdeplasma-addons/kdeplasma-addons-applets.install
Diffstat (limited to 'core/systemd/PKGBUILD')
-rw-r--r-- | core/systemd/PKGBUILD | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index c75bfffc5..399bffe0c 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') -pkgver=184 -pkgrel=2 +pkgver=185 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -16,14 +16,12 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - 'os-release' 'locale.sh') -md5sums=('6be0a2519fd42b988a1a2a56e5bd40c1' +md5sums=('a7dbbf05986eb0d2c164ec8e570eb78f' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - '752636def0db3c03f121f8b4f44a63cd' 'f15956945052bb911e5df81cf5e7e5dc') build() { @@ -71,11 +69,8 @@ package_systemd() { etc/systemd/journald.conf) install="systemd.install" - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" install -dm755 "$pkgdir/bin" @@ -115,7 +110,7 @@ package_systemd() { "$srcdir"/_tools/etc/udev \ "$srcdir"/_tools/usr/bin \ "$srcdir"/_tools/usr/include \ - "$srcdir"/_tools/usr/lib/{systemd/system,udev} \ + "$srcdir"/_tools/usr/lib/udev \ "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \ "$srcdir"/_tools/usr/lib/girepository-1.0 \ "$srcdir"/_tools/usr/share/pkgconfig \ |