From af77b6c2c1430f00850cb15ed0eda0a0fb41e1df Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 18 Sep 2013 15:05:07 +0200
Subject: [dbus] Create systemd service using a template instead of grabbing
 from running system Also remove the ugly hack that moves /lib/systemd to
 /etc/systemd; this would only help mixing systemd service files from the
 running system with our own -- trouble ahead! Warn if /lib/systemd exists in
 the target build dir.

---
 remote/setup_target | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'remote/setup_target')

diff --git a/remote/setup_target b/remote/setup_target
index 04af2158..00a182f3 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -358,13 +358,12 @@ process_module() {
 
 post_process_target() {
 	local TOOL_STR="$TOOL_STR post_process_target:"
-	# move systemd files from /lib to /etc/lib
-	pinfo "move systemd files from /lib/systemd to /etc/systemd"
 	if [ -d "${TARGET_BUILD_DIR}/lib/systemd" ]; then
-		cd "${TARGET_BUILD_DIR}/lib"
-		tarcopy "systemd" "${TARGET_BUILD_DIR}/etc"
-		cd - &> /dev/null
-		rm -r "${TARGET_BUILD_DIR}/lib/systemd"
+		pwarning "/lib/systemd exists in the generated target. It is not advisable to fetch existing"
+		pwarning "systemd service files from the template system, as it might conflict with generated"
+		pwarning "ones. In fact, some systems don't even use systemd so there might be no existing"
+		pwarning "service files. Please generate your own service file and place it in /etc/systemd."
+		pwarning "All files in /lib/systemd will be ignored."
 	fi
 
 	# figure out all relevant ld-paths
-- 
cgit v1.2.3-55-g7522