[Lunar-commits] <moonbase-core> systemd: Added distro patch and cleaned module files

[Peter de Ridder]

commit aafcf83c3f4d88f7ada052f0c3db7c296374dddb
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Mon, 31 Dec 2012 11:23:01 -0800
URL: https://github.com/lunar-linux/moonbase-core/commit/aafcf83c3f4d88f7ada052f0c3db7c296374dddb

systemd: Added distro patch and cleaned module files
---
  system/systemd/BUILD     | +4/-8     
  system/systemd/CONFIGURE | +0/-1     
  system/systemd/DEPENDS   | +4/-1     
  system/systemd/DETAILS   | +4/-1     
  4 files changed, 12 insertions(+), 11 deletions(-)

--- a/system/systemd/BUILD
+++ b/system/systemd/BUILD
@@ -1,16 +1,9 @@
 (
 
-  OPTS+=" --with-distro=other \
-          --libexecdir=/usr/lib \
-          --with-usb-ids-path=/usr/share/usb.ids \
-          --with-pci-ids-path=/usr/share/pci.ids \
+  OPTS+=" --libexecdir=/usr/lib \
           --enable-split-usr \
           --disable-tcpwrap"
 
-  if module_installed Linux-PAM; then
-    OPTS+=" --with-pamlibdir=/lib/security"
-  fi
-
   # a not existing hostname is set to lunar.
   [ -f /etc/hostname ] || install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/hostname /etc/hostname &&
 
@@ -25,6 +18,9 @@
   # the case in lunar, so we switch it to root.
   sedit "s:0775 root lock:0775 root root:" tmpfiles.d/legacy.conf &&
 
+  patch_it $SOURCE2 1 &&
+  autoreconf &&
+
   default_config &&
   make &&
   prepare_install &&
--- a/system/systemd/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-mquery IM_AN_IDIOT "Are you stupid and want a life of misery and disaster? (Enable SysV compatibility?)" n "--with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc" "--with-sysvinit-path= --with-sysvrcd-path="
--- a/system/systemd/DEPENDS
+++ b/system/systemd/DEPENDS
@@ -1,6 +1,5 @@
 depends docbook-xsl
 depends kmod
-depends Linux-PAM
 depends dbus
 depends libcap
 depends usbutils
@@ -8,4 +7,8 @@ depends pciutils
 depends intltool
 depends gperf
 
+# The SOURCE2 patch changes configure.ac and Makefile.am
+depends automake
+
 optional_depends "cryptsetup" "--enable-libcryptsetup" "--disable-libcryptsetup" "for Device-mapper crypto encryption"
+optional_depends "Linux-PAM" "--with-pamlibdir=/lib/security" "--disable-pam"
--- a/system/systemd/DETAILS
+++ b/system/systemd/DETAILS
@@ -1,11 +1,14 @@
           MODULE=systemd
          VERSION=196
           SOURCE=$MODULE-$VERSION.tar.xz
+         SOURCE2=$MODULE-$VERSION-lunar.patch
       SOURCE_URL=http://www.freedesktop.org/software/systemd
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:65f6844c2d2a5e6b7ed1f77bb9f457b04774c74f
+     SOURCE2_VFY=sha1:7b6438dfec9534d3203f99ff2d66c7030ec884a2
         WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd
          ENTERED=20100919
-         UPDATED=20121121
+         UPDATED=20121231
            SHORT="A system and program management daemon"
 
 cat << EOF