diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 16:36:47 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 16:36:47 -0300 |
commit | 572f3b3bd973bfa7e64c4c42fe87c8e3a79b7c20 (patch) | |
tree | 89f43dd22eaacadfa97977de1f3b73285da15735 /core/systemd/PKGBUILD | |
parent | cebf33d7109e0157a80f34d6136e212f0a28d274 (diff) | |
parent | 5898d76e47144f2366f9acda9ab52827b696c2d5 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/ecryptfs-utils/PKGBUILD
community/erlang/PKGBUILD
community/esmtp/PKGBUILD
community/gmic/PKGBUILD
community/ibus-sunpinyin/PKGBUILD
community/libev/PKGBUILD
community/libmirage/PKGBUILD
community/libraw/PKGBUILD
community/lilypond/PKGBUILD
community/luajit/PKGBUILD
community/matchbox-window-manager/PKGBUILD
community/miniupnpc/PKGBUILD
community/mplayer2/PKGBUILD
community/mumble/PKGBUILD
community/oss/PKGBUILD
community/pidgin-lwqq/PKGBUILD
community/postgis/PKGBUILD
community/python2-pytables/PKGBUILD
community/qmc2/PKGBUILD
community/qtfm/PKGBUILD
community/ruby-gtk3/PKGBUILD
community/tea/PKGBUILD
community/yacpi/PKGBUILD
core/bridge-utils/PKGBUILD
core/gcc/PKGBUILD
core/libsasl/PKGBUILD
core/lvm2/PKGBUILD
core/net-tools/PKGBUILD
core/ppp/PKGBUILD
core/pptpclient/PKGBUILD
core/sdparm/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit-tools/PKGBUILD
extra/aisleriot/PKGBUILD
extra/arora/PKGBUILD
extra/bluez-hcidump/PKGBUILD
extra/bluez/PKGBUILD
extra/cups/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/dhcp/PKGBUILD
extra/gnome-bluetooth/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnutls/PKGBUILD
extra/gts/PKGBUILD
extra/guile/PKGBUILD
extra/harfbuzz/PKGBUILD
extra/iptraf-ng/PKGBUILD
extra/json-c/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/libatasmart/PKGBUILD
extra/libbsd/PKGBUILD
extra/libdmtx/PKGBUILD
extra/libhangul/PKGBUILD
extra/libindi/PKGBUILD
extra/libpeas/PKGBUILD
extra/libsmbios/PKGBUILD
extra/libspiro/PKGBUILD
extra/libsrtp/PKGBUILD
extra/libxml2/PKGBUILD
extra/libxrender/PKGBUILD
extra/libxvmc/PKGBUILD
extra/llvm/PKGBUILD
extra/maxima/PKGBUILD
extra/msmtp/PKGBUILD
extra/ortp/PKGBUILD
extra/perl-dbd-sqlite/PKGBUILD
extra/perl-yaml-syck/PKGBUILD
extra/php/PKGBUILD
extra/pm-utils/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt4/PKGBUILD
extra/scim-anthy/PKGBUILD
extra/scim-chewing/PKGBUILD
extra/scim-m17n/PKGBUILD
extra/scim/PKGBUILD
extra/ssmtp/PKGBUILD
extra/texmacs/PKGBUILD
extra/v86d/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webkitgtk2/PKGBUILD
extra/wireshark/PKGBUILD
extra/zsh/PKGBUILD
libre/bogofilter-libre/PKGBUILD
libre/ecasound-libre/PKGBUILD
libre/libretools/libretools.install
libre/mc-libre/PKGBUILD
Diffstat (limited to 'core/systemd/PKGBUILD')
-rw-r--r-- | core/systemd/PKGBUILD | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index d26c533fb..ad695a979 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=204 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -14,24 +14,24 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection options=('!libtool' '!distcc') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch + 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch 'initcpio-hook-udev' 'initcpio-install-udev' - 'initcpio-install-timestamp' - 'use-split-usr-path.patch') + 'initcpio-install-timestamp') md5sums=('a07619bb19f48164fbf0761d12fd39a8' '7f39f9fde1ff7b48293ed1e3d0a6c213' + '66e3162856ded8eb7dc7383405c6e0d6' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' - 'df69615503ad293c9ddf9d8b7755282d' - '76bf83fe34c5b40533abc5dc940576a6') + 'df69615503ad293c9ddf9d8b7755282d') prepare() { cd "$pkgname-$pkgver" - # hang onto this until we do the /{,s}bin merge - patch -Np1 <"$srcdir/use-split-usr-path.patch" - patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch" + + patch -Np1 <"$srcdir/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch" + autoreconf } @@ -103,10 +103,6 @@ package_systemd() { # get rid of RPM macros rm -r "$pkgdir/etc/rpm" - # the path to udevadm is hardcoded in some places - install -d "$pkgdir/sbin" - ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" - # add back tmpfiles.d/legacy.conf install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" @@ -135,12 +131,12 @@ package_systemd-sysvcompat() { mv "$srcdir/_sysvcompat"/* "$pkgdir" - install -dm755 "$pkgdir/sbin" + install -dm755 "$pkgdir/usr/bin" for tool in runlevel reboot shutdown poweroff halt telinit; do - ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + ln -s 'systemctl' "$pkgdir/usr/bin/$tool" done - ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" + ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init" } # vim: ft=sh syn=sh et |