[Lunar-commits] <moonbase-core> systemd: version bumped to 215

[Stefan Wold]

commit c756f5ec62013817ffbadabb6ac3fefb64e34e6e
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 16 Aug 2014 22:12:15 +0200
URL: https://github.com/lunar-linux/moonbase-core/commit/c756f5ec62013817ffbadabb6ac3fefb64e34e6e

systemd: version bumped to 215

This bump has been long overdue. The compat patch is necessary to maintain
semi compatibility with some applications that yet has adapted to the combined
libsystemd without actually installing the compat libs.

We might have to fix a couple of modules to behave that depend on systemd, but
so far the only one I've found that need a small fix is sane-backends. Eventually
we should be able to drop the compat patch that only install a couple of .pc files.
---
  system/systemd/BUILD     | +7/-3     
  system/systemd/DEPENDS   | +1/-1     
  system/systemd/DETAILS   | +6/-3     
  system/systemd/PRE_BUILD | +21/-7    
  4 files changed, 35 insertions(+), 14 deletions(-)

--- a/system/systemd/BUILD
+++ b/system/systemd/BUILD
@@ -1,6 +1,8 @@
 OPTS+=" --libexecdir=/usr/lib \
         --enable-split-usr \
-        --disable-tcpwrap \
+        --disable-audit \
+        --disable-ima \
+        --disable-kdbus \
         --with-kbd-loadkeys=/usr/bin/loadkeys \
         --with-kbd-setfont=/usr/bin/setfont"
 
@@ -38,10 +40,12 @@ fi &&
 
 make install &&
 
+rm -rf /usr/lib/rpm &&
+
 # Disable new naming scheme
-if [[ "$NEW_NAME_SCHEME" == "n" && ! -e /etc/udev/rules.d/80-net-name-slot.rules ]]; then
+if [[ "$NEW_NAME_SCHEME" == "n" && ! -e /etc/udev/rules.d/80-net-setup-link.rules ]]; then
   echo "Disabled the new network interface naming scheme" 
-  ln -sf /dev/null /etc/udev/rules.d/80-net-name-slot.rules
+  ln -sf /dev/null /etc/udev/rules.d/80-net-setup-link.rules
 fi &&
 
 # Always install the legacy.conf file even if SysV compatibility isn't enabled
--- a/system/systemd/DEPENDS
+++ b/system/systemd/DEPENDS
@@ -5,9 +5,9 @@ depends intltool
 depends gperf
 depends xz
 depends util-linux
+depends kbd
 
 optional_depends "acl" "--enable-acl" "--disable-acl" "for ACL support"
-optional_depends "attr" "--enable-xattr" "--disable-xattr" "for extended fs attributes 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"
--- a/system/systemd/DETAILS
+++ b/system/systemd/DETAILS
@@ -1,11 +1,14 @@
           MODULE=systemd
-         VERSION=208
+         VERSION=215
           SOURCE=$MODULE-$VERSION.tar.xz
+         SOURCE2=systemd-215-compat-1.patch
       SOURCE_URL=http://www.freedesktop.org/software/systemd
-      SOURCE_VFY=sha1:e1a4e213d5d1e3498bca851347f2f07fdb9b4e1f
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha256:ce76a3c05e7d4adc806a3446a5510c0c9b76a33f19adc32754b69a0945124505
+     SOURCE2_VFY=sha256:36a9e52df6f10709225e0e16365f304ff9ff93833fabededdcafa23502df03c5
         WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd
          ENTERED=20100919
-         UPDATED=20131012
+         UPDATED=20140816
            SHORT="A system and program management daemon"
 PSAFE=no
 
--- a/system/systemd/PRE_BUILD
+++ b/system/systemd/PRE_BUILD
@@ -1,17 +1,30 @@
 for O in \
+  CONFIG_DEVTMPFS \
   CONFIG_FANOTIFY \
   CONFIG_DEVTMPFS \
-  CONFIG_CGROUPS
+  CONFIG_CGROUPS \
+  CONFIG_INOTIFY_USER \
+  CONFIG_SIGNALFD \
+  CONFIG_TIMERFD \
+  CONFIG_EPOLL \
+  CONFIG_NET \
+  CONFIG_SYSFS \
+  CONFIG_PROC_FS \
+  CONFIG_FHANDLE
 do
   if ! kernel_option_present $O ; then
-    message "${MESSAGE_COLOR}incompatible kernel option setting: ${PROBLEM_COLOR}$O${DEFAULT_COLOR}${MESSAGE_COLOR}"
-    message "Please ensure this kernel option is enabled, recompile your kernel and try again.${DEFAULT_COLOR}"
-    if ! query "Ignore this warning?" n ; then
-      exit 1
-    fi
+    FAIL=1
+    message "${MESSAGE_COLOR}Required kernel option not present: ${PROBLEM_COLOR}$O${DEFAULT_COLOR}${MESSAGE_COLOR}"
   fi
 done
 
+if [ -n "$FAIL" ]; then
+  message "Please ensure the kernel options above are enabled, then try again.${DEFAULT_COLOR}"
+  if ! query "Ignore this warning?" n ; then
+    exit 1
+  fi
+fi
+
 if mountpoint -q /usr; 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}"
@@ -20,4 +33,5 @@ if mountpoint -q /usr; then
   fi
 fi
 
-default_pre_build
+default_pre_build &&
+patch_it $SOURCE2 1