diff options
| author | Simon Rettberg | 2013-12-22 15:32:26 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-12-22 15:32:26 +0100 |
| commit | f5a11464d9e8f7baeaf8743aad44e31722b1865b (patch) | |
| tree | 6bc92a5a1f1946c02ded9149bea4b0a9030444c0 | |
| parent | [idleaction] Add scheduled shutdown functionality (still WIP) (diff) | |
| download | tm-scripts-f5a11464d9e8f7baeaf8743aad44e31722b1865b.tar.gz tm-scripts-f5a11464d9e8f7baeaf8743aad44e31722b1865b.tar.xz tm-scripts-f5a11464d9e8f7baeaf8743aad44e31722b1865b.zip | |
[systemd] Comment about the environment patching
| -rw-r--r-- | remote/modules/systemd/systemd.build | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index 2c15eccf..8ccb3cca 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -4,6 +4,9 @@ fetch_source () { # systemd download_untar "$REQUIRED_URL" "src/" # Patch PATH, HOME, USER environment + # TODO: Newer systemd versions support DefaultEnvironment=xxx in /etc/systemd/system.conf + # However, there were lots of changes after systemd 204, so we didn't update yet + # See http://cgit.freedesktop.org/systemd/systemd/tree/NEWS for changes. patch -p0 src/systemd-*/src/core/main.c < systemd-openslx.patch || perror "Failed to apply openslx systemd patch." # libkmod @@ -23,14 +26,14 @@ build () { pinfo "Building systemd" cd "${MODULE_DIR}/src/$REQUIRED_VERSION" pinfo "calling configure" - + # Save potentially pre-used paths/flages OLDLDFLAGS="$LDFLAGS" OLDCPPFLAGS="$CPPFLAGS" OLDPKG_CONFIG_PATH="$PKG_CONFIG_PATH" OLDLD_LIBRARY_PATH="$LD_LIBRARY_PATH" - export LDFLAGS="$LDFLAGS -L${MODULE_BUILD_DIR}/usr/lib" + export LDFLAGS="$LDFLAGS -L${MODULE_BUILD_DIR}/usr/lib" export CPPFLAGS="-I${MODULE_BUILD_DIR}/usr/include" export PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/lib64/pkgconfig:${MODULE_BUILD_DIR}/usr/lib/pkgconfig" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${MODULE_BUILD_DIR}/usr/lib:${MODULE_BUILD_DIR}/usr/lib64" |