libre/systemd: Tidy, also package libsystemd, systemd-sysvcompat.

1 files changed, 48 insertions, 14 deletions

diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 7a8dcd070..7ce39780f 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -1,21 +1,22 @@
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
 # Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgbase=systemd
-pkgname=systemd
+pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=229
 pkgrel=3.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
-             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-libre-api-headers'
+             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-lxml' 'quota-tools' 'shadow' 'git')
-[ "$CARCH" != "armv7h" ] && makedepends+=('gnu-efi-libs')
+makedepends_i686=('gnu-efi-libs')
+makedepends_x86_64=('gnu-efi-libs')
 options=('strip' 'debug')
 source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
-        "https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig}
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
@@ -26,10 +27,9 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
         '0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch'
         '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch'
         '0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch'
-        '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch')
+        '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch'
+        "https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig})
 md5sums=('SKIP'
-         'f8253cd3c0f249591338fbb4c223d249'
-         'SKIP'
          '90ea67a7bb237502094914622a39e281'
          '976c5511b6493715e381f43f16cdb151'
          '1b3aa3a0551b08af9305d33f85b5c2fc'
@@ -40,7 +40,9 @@ md5sums=('SKIP'
          'e592f6778c12627d46982ddfe0698361'
          'c4c559f9916806f5162ccff3e7c433e8'
          '5166fe700ef5991c2da3876206c699fb'
-         '166ce41b60d4eaa7738486f7aab5ebd8')
+         '166ce41b60d4eaa7738486f7aab5ebd8'
+         'f8253cd3c0f249591338fbb4c223d249'
+         'SKIP')
 validpgpkeys=('684D54A189305A9CC95446D36B888913DDB59515') # Márcio Silva
 
 prepare() {
@@ -79,8 +81,11 @@ build() {
     LDFLAGS+=" -Wl,-fuse-ld=bfd"
     CFLAGS+=" -fno-lto"
     CXXFLAGS+=" -fno-lto"
-  else
-    extra=--enable-gnuefi
+  fi
+
+  local enable_gnuefi=''
+  if [ "$CARCH" != "armv7h" ]; then
+    enable_gnuefi='--enable-gnuefi'
   fi
 
   ./configure \
@@ -88,21 +93,21 @@ build() {
       --localstatedir=/var \
       --sysconfdir=/etc \
       --enable-lz4 \
+      $enable_gnuefi \
       --disable-audit \
       --disable-ima \
       --with-sysvinit-path= \
       --with-sysvrcnd-path= \
-      --with-ntp-servers="${timeservers[*]}" \
-      $extra
+      --with-ntp-servers="${timeservers[*]}"
 
   make
 }
 
 package_systemd() {
-  pkgdesc="system and service manager (Parabola rebranded)"
+  pkgdesc="system and service manager"
   license=('GPL2' 'LGPL2.1')
   depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
-           'libgcrypt' "libsystemd=$pkgver" 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
+           'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
            'util-linux' 'xz')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
   replaces=('nss-myhostname' 'systemd-tools' 'udev')
@@ -184,4 +189,33 @@ package_systemd() {
   install -Dm644 "$srcdir/splash-parabola.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp
 }
 
+package_libsystemd() {
+  pkgdesc="systemd client libraries"
+  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
+  license=('GPL2')
+  provides=('libsystemd.so' 'libudev.so')
+
+  make -C "$pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES
+}
+
+package_systemd-sysvcompat() {
+  pkgdesc="sysvinit compat for systemd"
+  license=('GPL2')
+  groups=('base')
+  conflicts=('sysvinit')
+  depends=('systemd')
+
+  install -dm755 "$pkgdir"/usr/share/man/man8
+  cp -d --no-preserve=ownership,timestamp \
+    "$pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+    "$pkgdir"/usr/share/man/man8
+
+  install -dm755 "$pkgdir/usr/bin"
+  for tool in runlevel reboot shutdown poweroff halt telinit; do
+    ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
+  done
+
+  ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
+}
+
 # vim: ft=sh syn=sh et