diff options
| author | Christian Rößler | 2014-04-14 15:21:07 +0200 |
|---|---|---|
| committer | Christian Rößler | 2014-04-14 15:21:07 +0200 |
| commit | c96f8542dbc8a3fe28bc9b094b5768f5bee218af (patch) | |
| tree | 251f26e6ffd76336da723c14e9a12139267ad46d /remote/modules | |
| parent | [vmchooser-runvirt] Just a little typo. (diff) | |
| parent | [systemd] use systemd 212 (only for ubuntu 14 for now) (diff) | |
| download | tm-scripts-c96f8542dbc8a3fe28bc9b094b5768f5bee218af.tar.gz tm-scripts-c96f8542dbc8a3fe28bc9b094b5768f5bee218af.tar.xz tm-scripts-c96f8542dbc8a3fe28bc9b094b5768f5bee218af.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/kdm/module.conf.ubuntu.14 (renamed from remote/modules/kdm/module.conf.ubuntu.14.04) | 0 | ||||
| -rw-r--r-- | remote/modules/systemd/module.build | 11 | ||||
| -rw-r--r-- | remote/modules/systemd/module.conf.ubuntu.14 (renamed from remote/modules/systemd/module.conf.ubuntu.14.04) | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/remote/modules/kdm/module.conf.ubuntu.14.04 b/remote/modules/kdm/module.conf.ubuntu.14 index e29f35d0..e29f35d0 100644 --- a/remote/modules/kdm/module.conf.ubuntu.14.04 +++ b/remote/modules/kdm/module.conf.ubuntu.14 diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build index 95576548..3b11c5ee 100644 --- a/remote/modules/systemd/module.build +++ b/remote/modules/systemd/module.build @@ -27,6 +27,17 @@ build () { cd "${MODULE_DIR}/src/$REQUIRED_VERSION" pinfo "calling configure" + # patch src/core/socket.c if activated in the config file + if [ "$REQUIRED_XATTR_PATCH" == "xyes" ]; then + # patch it + if [ -e "src/core/socket.c" ]; then + sed 's/^#include <attr\/xattr.h>$/#include <sys\/xattr.h>\n#include <attr\/xattr.h>/g' src/core/socket.c \ + || perror "Could not patch '$(pwd)/src/core/socket.c'" + else + perror "'$(pwd)/src/core/socket.c' does not exist." + fi + fi + # Save potentially pre-used paths/flages OLDLDFLAGS="$LDFLAGS" OLDCPPFLAGS="$CPPFLAGS" diff --git a/remote/modules/systemd/module.conf.ubuntu.14.04 b/remote/modules/systemd/module.conf.ubuntu.14 index 2768b51c..1724d26f 100644 --- a/remote/modules/systemd/module.conf.ubuntu.14.04 +++ b/remote/modules/systemd/module.conf.ubuntu.14 @@ -1,3 +1,5 @@ +REQUIRED_VERSION="systemd-212" +REQUIRED_LIBKMOD_VERSION="kmod-15" REQUIRED_INSTALLED_PACKAGES=" intltool gperf @@ -11,3 +13,4 @@ REQUIRED_INSTALLED_PACKAGES=" libacl1-dev libpam-dev " +REQUIRED_XATTR_PATCH="yes" |