From 6d8ae90844e2c82226e895fc767078f2beeaefd1 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 14 Apr 2014 16:11:26 +0200
Subject: [systemd] fixes for the patch apply logic...

---
 remote/modules/systemd/module.build | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'remote')

diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build
index 70ddfcc5..2c27231e 100644
--- a/remote/modules/systemd/module.build
+++ b/remote/modules/systemd/module.build
@@ -7,14 +7,17 @@ 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 [ "$REQUIRED_XATTR_PATCH" = "xyes" ]; then
+		if [ "x$REQUIRED_XATTR_PATCH" = "xyes" ]; then
+			pinfo "Patching 'src/core/socket.c' ..."
 			# patch it
-			if [ -e "src/core/socket.c" ]; then
-				sed -i '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'"
+			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 "'$(pwd)/src/core/socket.c' does not exist."
+				perror "'src/$REQUIRED_VERSION//src/core/socket.c' does not exist."
 			fi
 		fi
 	else
-- 
cgit v1.2.3-55-g7522