diff options
Diffstat (limited to 'core/modules/systemd/module.build')
| -rw-r--r-- | core/modules/systemd/module.build | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/core/modules/systemd/module.build b/core/modules/systemd/module.build index f433a7bd..5d634f0e 100644 --- a/core/modules/systemd/module.build +++ b/core/modules/systemd/module.build @@ -11,11 +11,11 @@ fetch_source () { if [ "x$REQUIRED_XATTR_PATCH" = "xyes" ]; then pinfo "Patching 'src/core/socket.c' ..." # patch it - if [ -e "src/$REQUIRED_VERSION/src/core/socket.c" ]; then - sed -i 's/^#include <attr\/xattr.h>$/#include <sys\/xattr.h>\n#include <attr\/xattr.h>/g' "src/$REQUIRED_VERSION/src/core/socket.c" \ - || perror "Could not patch 'src/$REQUIRED_VERSION/src/core/socket.c'" + if [ -e "src/systemd-$REQUIRED_VERSION/src/core/socket.c" ]; then + sed -i 's/^#include <attr\/xattr.h>$/#include <sys\/xattr.h>\n#include <attr\/xattr.h>/g' "src/systemd-$REQUIRED_VERSION/src/core/socket.c" \ + || perror "Could not patch 'src/systemd-$REQUIRED_VERSION/src/core/socket.c'" else - perror "'src/$REQUIRED_VERSION/src/core/socket.c' does not exist." + perror "'src/systemd-$REQUIRED_VERSION/src/core/socket.c' does not exist." fi fi # now check if the old fix needs to be applied @@ -51,11 +51,11 @@ fetch_source () { fi fi - elif [ "x${REQUIRED_VERSION#systemd-}" = "x229" ]; then - patch -p0 src/systemd-*/src/basic/path-util.h < ${MODULE_DIR}/systemd-openslx-229.patch || perror "Failed to apply openslx systemd patch." + elif [ -e "${MODULE_DIR}/systemd-openslx-${REQUIRED_VERSION#systemd-}.patch" ]; then + patch -p0 src/systemd-*/src/basic/path-util.h < "${MODULE_DIR}/systemd-openslx-${REQUIRED_VERSION#systemd-}.patch" || perror "Failed to apply openslx systemd patch." else # TODO use the above hint for setting environmenet through /etc/systemd/system.conf - pinfo "Missing..." + pwarning "OpenSLX patch for systemd missing..." fi # libkmod @@ -73,8 +73,8 @@ build () { #build systemd pinfo "Building systemd" - cd "${MODULE_WORK_DIR}/src/$REQUIRED_VERSION" - pinfo "calling configure in ${MODULE_WORK_DIR}/src/$REQUIRED_VERSION" + cd "${MODULE_WORK_DIR}/src/systemd-$REQUIRED_VERSION" + pinfo "calling configure in ${MODULE_WORK_DIR}/src/systemd-$REQUIRED_VERSION" # Save potentially pre-used paths/flages OLDLDFLAGS="$LDFLAGS" @@ -103,6 +103,16 @@ build () { --disable-localed \ --disable-coredump \ --disable-keymap \ + --disable-hwdb \ + --disable-ldconfig \ + --disable-networkd \ + --disable-resolved \ + --disable-timesyncd \ + --disable-importd \ + --disable-rfkill \ + --disable-backlight \ + --disable-firstboot \ + --disable-nss-systemd \ --without-python \ --enable-blkid \ --enable-acl \ @@ -116,6 +126,9 @@ build () { pinfo "calling make install" DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed." cd - &> /dev/null + # Nonsense in our env + rm -f -- "${MODULE_BUILD_DIR}/usr/lib/tmpfiles.d/etc.conf" + rm -f -- "${MODULE_BUILD_DIR}/usr/lib/tmpfiles.d/systemd-remote.conf" # Restore used flags/paths: export LDFLAGS="$OLDLDFLAGS" @@ -125,6 +138,7 @@ build () { } post_copy() { - : + add_user "kvm" + add_user "systemd-journal-upload" } |