systemd: install to /usr, but install core libs and binaries used for…

… system-generator to /

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/sysutils/systemd/package.mk

@@ -105,7 +105,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --with-dbuspolicydir=/etc/dbus-1/system.d \
                            --with-dbussessionservicedir=/usr/share/dbus-1/services \
                            --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
-                           --with-rootprefix=/ \
+                           --with-rootprefix=/usr \
                            --with-rootlibdir=/usr/lib"
 
 unpack() {
@@ -174,8 +174,8 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/systemd-nspawn
   rm -rf $INSTALL/usr/lib/systemd/system/systemd-nspawn@.service
 
-  # remove genetators/catalog
-  rm -rf $INSTALL/usr/lib/systemd/system-generators
+  # remove generators/catalog
+  rm -rf $INSTALL/lib/systemd/system-generators/*
   rm -rf $INSTALL/usr/lib/systemd/catalog
 
   # disable usage of presets, see: https://freedesktop.org/wiki/Software/systemd/Preset/

packages/sysutils/systemd/patches/systemd-00-rootlibexecdir.patch

@@ -0,0 +1,12 @@
+diff -Naur systemd-232/Makefile.am systemd-232.patch/Makefile.am
+--- systemd-232/Makefile.am	2016-11-03 18:16:42.000000000 +0100
++++ systemd-232.patch/Makefile.am	2016-12-08 11:21:36.499028075 +0100
+@@ -95,7 +95,7 @@
+ # And these are the special ones for /
+ rootprefix=@rootprefix@
+ rootbindir=$(rootprefix)/bin
+-rootlibexecdir=$(rootprefix)/lib/systemd
++rootlibexecdir=/lib/systemd
+
+ EXTRA_DIST =
+ BUILT_SOURCES =

scripts/install

@@ -87,8 +87,8 @@ if [ "$TARGET" = target ] ; then
   fi
 
   if [ -d $PKG_DIR/generators.d ]; then
-    mkdir -p $INSTALL/usr/lib/systemd/system-generators
-    cp $PKG_DIR/generators.d/* $INSTALL/usr/lib/systemd/system-generators
+    mkdir -p $INSTALL/lib/systemd/system-generators
+    cp $PKG_DIR/generators.d/* $INSTALL/lib/systemd/system-generators
   fi
 
   if [ -d $PKG_DIR/system.d ]; then