[arch-commits] Commit in systemd/trunk (PKGBUILD systemd.install)

[Tom Gundersen]

    Date: Saturday, March 31, 2012 @ 17:05:02
  Author: tomegun
Revision: 154952

upgpkg: systemd 44-2

move config files to /usr/lib by default. stuff in /lib is still read.

Will have to rebuild non-config things, like with udev, but that is only one or two packages.

A rebuild of the symlinks package is also needde as reboot and friends point at the wrong place.

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-----------------+
 PKGBUILD        |   14 ++++++++------
 systemd.install |    1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-31 20:30:25 UTC (rev 154951)
+++ PKGBUILD	2012-03-31 21:05:02 UTC (rev 154952)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd')
 pkgver=44
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2')
@@ -26,17 +26,16 @@
 
   ./configure --sysconfdir=/etc \
               --libexecdir=/usr/lib \
-              --libdir=/usr/lib \
               --with-pamlibdir=/lib/security \
               --localstatedir=/var \
-              --with-rootprefix= \
-              --with-distro=arch
+              --with-distro=arch \
+              --enable-split-usr
 
   make
 }
 
 package_systemd() {
-  pkgdesc="systemd and service manager"
+  pkgdesc="system and service manager"
   depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
   optdepends=('cryptsetup: required for encrypted block devices'
               'dbus-python: systemd-analyze'
@@ -66,7 +65,10 @@
   chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
 
   # symlink to /bin/systemd for compat and sanity
-  ln -s ../lib/systemd/systemd "$pkgdir/bin/systemd"
+  mkdir -p "$pkgdir/bin"
+  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
+  mkdir -p "$pkgdir/lib/systemd"
+  ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd"
 
   # use python2 for systemd-analyze
   sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"

Modified: systemd.install
===================================================================
--- systemd.install	2012-03-31 20:30:25 UTC (rev 154951)
+++ systemd.install	2012-03-31 21:05:02 UTC (rev 154952)
@@ -30,6 +30,7 @@
 
   if sd_booted; then
     systemctl daemon-reexec >/dev/null
+    systemctl daemon-reload >/dev/null
   fi
 
   newpkgver=${1%-*}