[Lunar-commits] <moonbase-core> Merge branch 'Florin65-systemd'

[Stefan Wold]

commit 57547eec1e9e5e54e06424948e2d4b57c1f86b0b
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 20 Sep 2014 12:33:45 +0200
URL: https://github.com/lunar-linux/moonbase-core/commit/57547eec1e9e5e54e06424948e2d4b57c1f86b0b

Merge branch 'Florin65-systemd'
---
  system/systemd/BUILD     | +6/-5     
  system/systemd/DEPENDS   | +13/-8    
  system/systemd/DETAILS   | +5/-5     
  system/systemd/PRE_BUILD | +3/-2     
  4 files changed, 27 insertions(+), 20 deletions(-)

--- a/system/systemd/BUILD
+++ b/system/systemd/BUILD
@@ -1,8 +1,9 @@
-OPTS+=" --libexecdir=/usr/lib \
-        --enable-split-usr \
-        --disable-audit \
-        --disable-ima \
-        --disable-kdbus \
+OPTS+=" --libexecdir=/usr/lib  \
+        --enable-split-usr     \
+        --disable-terminal     \
+        --disable-audit        \
+        --disable-ima          \
+        --disable-kdbus        \
         --with-kbd-loadkeys=/usr/bin/loadkeys \
         --with-kbd-setfont=/usr/bin/setfont"
 
--- a/system/systemd/DEPENDS
+++ b/system/systemd/DEPENDS
@@ -3,14 +3,19 @@ depends dbus
 depends libcap
 depends intltool
 depends gperf
-depends xz
 depends util-linux
 depends kbd
 
-optional_depends "acl" "--enable-acl" "--disable-acl" "for ACL support"
-optional_depends "cryptsetup" "--enable-libcryptsetup" "--disable-libcryptsetup" "for Device-mapper crypto encryption"
-optional_depends "Linux-PAM" "--with-pamlibdir=/lib/security" "--disable-pam" "for PAM support"
-optional_depends "docbook-xsl" "" "--disable-manpages" "for manpages"
-optional_depends "docbook-xml" "" "--disable-manpages" "for manpages"
-optional_depends "glib-2" "--enable-gudev" "--disable-gudev" "for Gobject libudev support"
-optional_depends "libgcrypt" "--enable-gcrypt" "--disable-gcrypt" "for gcrypt support"
+optional_depends "acl"           "--enable-acl"                   "--disable-acl"           "for ACL support"
+optional_depends "cryptsetup"    "--enable-libcryptsetup"         "--disable-libcryptsetup" "for device-mapper crypto encryption"
+optional_depends "Linux-PAM"     "--with-pamlibdir=/lib/security" "--disable-pam"           "for PAM support"
+optional_depends "docbook-xsl"   ""                               "--disable-manpages"      "for manpages"
+optional_depends "docbook-xml"   ""                               "--disable-manpages"      "for manpages"
+optional_depends "glib-2"        "--enable-gudev"                 "--disable-gudev"         "for Gobject libudev support"
+optional_depends "gobject-introspection" "--enable-introspection" "--disable-introspection" "for introspection support"
+optional_depends "libgcrypt"     "--enable-gcrypt"                "--disable-gcrypt"        "for gcrypt support"
+optional_depends "elfutils"      "--enable-elfutils"              "--disable-elfutils"      "for elfutils support"
+optional_depends "libseccomp"    "--enable-seccomp"               "--disable-seccomp"       "for seccomp support"
+optional_depends "libmicrohttpd" "--enable-microhttpd"            "--disable-microhttpd"    "for microhttpd support"
+optional_depends "polkit"        "--enable-polkit"                "--disable-polkit"        "for user policy support"
+optional_depends "xz"            "--enable-xz"                    "--disable-xz"            "for xz compression support"
--- a/system/systemd/DETAILS
+++ b/system/systemd/DETAILS
@@ -1,14 +1,14 @@
           MODULE=systemd
-         VERSION=215
+         VERSION=216
           SOURCE=$MODULE-$VERSION.tar.xz
-         SOURCE2=systemd-215-compat-1.patch
+         SOURCE2=systemd-216-compat-1.patch
       SOURCE_URL=http://www.freedesktop.org/software/systemd
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha256:ce76a3c05e7d4adc806a3446a5510c0c9b76a33f19adc32754b69a0945124505
-     SOURCE2_VFY=sha256:36a9e52df6f10709225e0e16365f304ff9ff93833fabededdcafa23502df03c5
+      SOURCE_VFY=sha256:945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3
+     SOURCE2_VFY=sha256:e8a73f26fea0a3cada63c514eda690fb6a7b2f59533f8a14bb3834597539c65b
         WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd
          ENTERED=20100919
-         UPDATED=20140816
+         UPDATED=20140920
            SHORT="A system and program management daemon"
 PSAFE=no
 
--- a/system/systemd/PRE_BUILD
+++ b/system/systemd/PRE_BUILD
@@ -25,9 +25,10 @@ if [ -n "$FAIL" ]; then
   fi
 fi
 
-if mountpoint -q /usr; then
+if mountpoint -q /usr && ! module_installed dracut; then
   message "${PROBLEM_COLOR}WARNING: ${MESSAGE_COLOR}You appear to have an /usr partition mounted. If you continue this"
-  message "installation your computer will NOT be able to boot properly. This will be supported soon!${DEFAULT_COLOR}"
+  message "installation your computer might NOT be able to boot properly. Installing dracut to get initrd support"
+  message "will take care of the issue.${DEFAULT_COLOR}"
   if ! query "Ignore this warning and continue installation?" n ; then
     exit 1
   fi