summaryrefslogtreecommitdiffstats
path: root/remote/modules/systemd
diff options
context:
space:
mode:
authorJonathan Bauer2014-04-14 15:08:29 +0200
committerJonathan Bauer2014-04-14 15:08:29 +0200
commit213b6b01171b608ab2c3e57a75969063878b3f05 (patch)
treee7853411d58073e458ed8ac5231cf28051bc6c10 /remote/modules/systemd
parentlets try to make it work for Ubuntu 14.x before forcing subversion (diff)
downloadtm-scripts-213b6b01171b608ab2c3e57a75969063878b3f05.tar.gz
tm-scripts-213b6b01171b608ab2c3e57a75969063878b3f05.tar.xz
tm-scripts-213b6b01171b608ab2c3e57a75969063878b3f05.zip
[systemd] patch src/core/socket.c for ubuntu 14
Diffstat (limited to 'remote/modules/systemd')
-rw-r--r--remote/modules/systemd/module.build11
-rw-r--r--remote/modules/systemd/module.conf.ubuntu.142
2 files changed, 12 insertions, 1 deletions
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 b/remote/modules/systemd/module.conf.ubuntu.14
index ae603684..d8e41bef 100644
--- a/remote/modules/systemd/module.conf.ubuntu.14
+++ b/remote/modules/systemd/module.conf.ubuntu.14
@@ -11,4 +11,4 @@ REQUIRED_INSTALLED_PACKAGES="
libacl1-dev
libpam-dev
"
-REQUIRED_SYS_ATTR_PATCH="yes"
+REQUIRED_XATTR_PATCH="yes"