From 27a36ead9a8dfa042d649211dcdc1666081eea89 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 18 Sep 2013 15:09:33 +0200
Subject: [dbus] Fix mkdir, remove /lib/systemd from required directories

---
 remote/modules/dbus/dbus.build         | 2 +-
 remote/modules/dbus/dbus.conf.opensuse | 5 +----
 remote/modules/dbus/dbus.conf.ubuntu   | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/dbus/dbus.build b/remote/modules/dbus/dbus.build
index 81c849fb..beb557b4 100644
--- a/remote/modules/dbus/dbus.build
+++ b/remote/modules/dbus/dbus.build
@@ -12,7 +12,7 @@ build() {
 	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
 	
 	# Generate systemd files
-	mkdir "$MODULE_BUILD_DIR/etc/systemd/system"
+	mkdir -p "$MODULE_BUILD_DIR/etc/systemd/system"
 	local UUIDGEN=$(find "$MODULE_BUILD_DIR" -name dbus-uuidgen -executable | head -n 1)
 	local DAEMON=$(find "$MODULE_BUILD_DIR" -name dbus-daemon -executable | head -n 1)
 	local SEND=$(find "$MODULE_BUILD_DIR" -name dbus-send -executable | head -n 1)
diff --git a/remote/modules/dbus/dbus.conf.opensuse b/remote/modules/dbus/dbus.conf.opensuse
index 93610f62..9bc514e2 100644
--- a/remote/modules/dbus/dbus.conf.opensuse
+++ b/remote/modules/dbus/dbus.conf.opensuse
@@ -1,7 +1,4 @@
 REQUIRED_CONTENT_PACKAGES="
 			dbus-1
 "
-REQUIRED_DIRECTORIES+="	
-			/usr/lib/systemd
-"
-REQUIRED_FILES=""
+
diff --git a/remote/modules/dbus/dbus.conf.ubuntu b/remote/modules/dbus/dbus.conf.ubuntu
index d007c2ef..9f302876 100644
--- a/remote/modules/dbus/dbus.conf.ubuntu
+++ b/remote/modules/dbus/dbus.conf.ubuntu
@@ -1,9 +1,7 @@
 REQUIRED_CONTENT_PACKAGES="
 			dbus
 "
-REQUIRED_DIRECTORIES+="		
-			/lib/systemd
-"
 REQUIRED_FILES="	
 			/etc/default/dbus
 "
+
-- 
cgit v1.2.3-55-g7522