diff options
| author | Jonathan Bauer | 2014-04-15 14:00:47 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2014-04-15 14:00:47 +0200 |
| commit | 2a3eda5acb6cdf21501ba8ff2aeccd4abc7256a0 (patch) | |
| tree | 47197ec885b2d8a506a1f6a83c2d94387581e202 /remote/modules/systemd | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-2a3eda5acb6cdf21501ba8ff2aeccd4abc7256a0.tar.gz tm-scripts-2a3eda5acb6cdf21501ba8ff2aeccd4abc7256a0.tar.xz tm-scripts-2a3eda5acb6cdf21501ba8ff2aeccd4abc7256a0.zip | |
[qt] update build scripts to always activate qt4
Diffstat (limited to 'remote/modules/systemd')
| -rw-r--r-- | remote/modules/systemd/module.build | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build index 2c27231e..79dec526 100644 --- a/remote/modules/systemd/module.build +++ b/remote/modules/systemd/module.build @@ -6,21 +6,18 @@ fetch_source () { # starting with systemd 212 a new way of setting global environment is supported # meaning we don't have to apply the patch needed til that version. - if [ "x${REQUIRED_VERSION#systemd-}" = "x212" ]; then - pinfo "Systemd version 212 detected." - pinfo "REQUIRED_XATTR_PATCH is $REQUIRED_XATTR_PATCH" - # patch src/core/socket.c if activated in the config file - 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'" - else - perror "'src/$REQUIRED_VERSION//src/core/socket.c' does not exist." - fi + # patch src/core/socket.c if activated in the config file + 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'" + else + perror "'src/$REQUIRED_VERSION/src/core/socket.c' does not exist." fi - else + fi + if [ "x${REQUIRED_VERSION#systemd-}" = "x204" ]; then # 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 |