daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1ff636
From 33ee9624d4fb50f29f2e3c8ffd0c7efa95a03f02 Mon Sep 17 00:00:00 2001
1ff636
From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
1ff636
Date: Tue, 17 Mar 2015 16:37:07 +0100
1ff636
Subject: [PATCH] resolved: Do not add .busname dependencies, when compiling
1ff636
 without kdbus.
1ff636
1ff636
(cherry picked from commit defa8e675b2903ad53e093bb2847c7256f0779a5)
1ff636
1ff636
Cherry-picked from: 33ff64c
1ff636
Resolves: #1222517
1ff636
---
23b3cf
 Makefile.am                                                     | 2 +-
23b3cf
 units/.gitignore                                                | 1 +
23b3cf
 ...stemd-resolved.service.in => systemd-resolved.service.m4.in} | 2 ++
1ff636
 3 files changed, 4 insertions(+), 1 deletion(-)
1ff636
 rename units/{systemd-resolved.service.in => systemd-resolved.service.m4.in} (96%)
1ff636
1ff636
diff --git a/Makefile.am b/Makefile.am
c62b8e
index 8474b29129..604eaf2f17 100644
1ff636
--- a/Makefile.am
1ff636
+++ b/Makefile.am
1ff636
@@ -5520,7 +5520,7 @@ dist_dbussystemservice_DATA += \
1ff636
 	src/resolve/org.freedesktop.resolve1.service
1ff636
 
1ff636
 EXTRA_DIST += \
1ff636
-	units/systemd-resolved.service.in
1ff636
+	units/systemd-resolved.service.m4.in
1ff636
 
1ff636
 SYSTEM_UNIT_ALIASES += \
1ff636
 	systemd-resolved.service dbus-org.freedesktop.resolve1.service
1ff636
diff --git a/units/.gitignore b/units/.gitignore
c62b8e
index 638a7abc4c..7f3e0d093c 100644
1ff636
--- a/units/.gitignore
1ff636
+++ b/units/.gitignore
1ff636
@@ -58,6 +58,7 @@
1ff636
 /systemd-reboot.service
1ff636
 /systemd-remount-fs.service
1ff636
 /systemd-resolved.service
1ff636
+/systemd-resolved.service.m4
1ff636
 /systemd-hibernate-resume@.service
1ff636
 /systemd-rfkill@.service
1ff636
 /systemd-shutdownd.service
1ff636
diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.m4.in
1ff636
similarity index 96%
1ff636
rename from units/systemd-resolved.service.in
1ff636
rename to units/systemd-resolved.service.m4.in
c62b8e
index b643da9a73..d133847d5e 100644
1ff636
--- a/units/systemd-resolved.service.in
1ff636
+++ b/units/systemd-resolved.service.m4.in
1ff636
@@ -10,11 +10,13 @@ Description=Network Name Resolution
1ff636
 Documentation=man:systemd-resolved.service(8)
1ff636
 After=systemd-networkd.service network.service
1ff636
 
1ff636
+m4_ifdef(`ENABLE_KDBUS',
1ff636
 # On kdbus systems we pull in the busname explicitly, because it
1ff636
 # carries policy that allows the daemon to acquire its name.
1ff636
 Wants=org.freedesktop.resolve1.busname
1ff636
 After=org.freedesktop.resolve1.busname
1ff636
 
1ff636
+)m4_dnl
1ff636
 [Service]
1ff636
 Type=notify
1ff636
 Restart=always