Commit 3ce3663a authored by Michael Biebl's avatar Michael Biebl
Browse files

Cherry-pick upstream commit to not install busname units if kdbus support is disabled

parent 727c2c80
......@@ -13,6 +13,8 @@ systemd (215-1) UNRELEASED; urgency=medium
- Add two new symbols for libudev1.
- Remove private symbol from libgudev-1.0-0. This symbol was never part of
the public API and not used anywhere so we don't need a soname bump.
* Cherry-pick upstream commit to not install busname units if kdbus support
is disabled.
-- Michael Biebl <biebl@debian.org> Tue, 26 Aug 2014 12:09:10 +0200
......
From: Michael Biebl <biebl@debian.org>
Date: Wed, 3 Sep 2014 23:34:29 +0200
Subject: build: don't install busname units and target if kdbus support is
disabled
(cherry picked from commit 36e46fe9b625b7a63a6b38f43dc55298c8a0ac89)
---
Makefile.am | 43 ++++++++++++++++++++++++++++++++-----------
1 file changed, 32 insertions(+), 11 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 764a4fd..dd01efe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,6 +139,7 @@ dist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_dbussystemservice_DATA =
+dist_systemunit_DATA_busnames =
check_PROGRAMS =
check_DATA =
tests=
@@ -257,10 +258,12 @@ install-target-wants-hook:
what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
- what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+
+install-busnames-target-wants-hook:
+ what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
define add-wants
@@ -310,6 +313,11 @@ INSTALL_EXEC_HOOKS += \
install-aliases-hook \
install-touch-usr-hook
+if ENABLE_KDBUS
+INSTALL_EXEC_HOOKS += \
+ install-busnames-target-wants-hook
+endif
+
# ------------------------------------------------------------------------------
AM_V_M4 = $(AM_V_M4_$(V))
AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY))
@@ -456,7 +464,6 @@ dist_systemunit_DATA = \
units/sigpwr.target \
units/sleep.target \
units/sockets.target \
- units/busnames.target \
units/timers.target \
units/paths.target \
units/suspend.target \
@@ -485,6 +492,14 @@ dist_systemunit_DATA = \
units/initrd-switch-root.target \
units/ldconfig.service
+if ENABLE_KDBUS
+dist_systemunit_DATA += \
+ $(dist_systemunit_DATA_busnames)
+endif
+
+dist_systemunit_DATA_busnames += \
+ units/busnames.target
+
nodist_systemunit_DATA = \
units/getty@.service \
units/serial-getty@.service \
@@ -4135,7 +4150,7 @@ rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-hostnamed.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.hostname1.busname
dist_dbuspolicy_DATA += \
@@ -4178,13 +4193,11 @@ EXTRA_DIST += \
units/systemd-hostnamed.service.in
# ------------------------------------------------------------------------------
-if ENABLE_KDBUS
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.systemd1.busname
BUSNAMES_TARGET_WANTS += \
org.freedesktop.systemd1.busname
-endif
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
@@ -4199,7 +4212,7 @@ systemd_localed_LDADD = \
nodist_systemunit_DATA += \
units/systemd-localed.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.locale1.busname
rootlibexec_PROGRAMS += \
@@ -4277,7 +4290,7 @@ dist_dbuspolicy_DATA += \
nodist_systemunit_DATA += \
units/systemd-timedated.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.timedate1.busname
polkitpolicy_files += \
@@ -4442,7 +4455,9 @@ nodist_systemunit_DATA += \
units/systemd-machined.service
dist_systemunit_DATA += \
- units/machine.slice \
+ units/machine.slice
+
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.machine1.busname
dist_dbussystemservice_DATA += \
@@ -4775,7 +4790,9 @@ nodist_systemunit_DATA += \
units/systemd-user-sessions.service
dist_systemunit_DATA += \
- units/user.slice \
+ units/user.slice
+
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.login1.busname
dist_dbussystemservice_DATA += \
@@ -5381,7 +5398,6 @@ SYSTEM_UNIT_ALIASES += \
USER_UNIT_ALIASES += \
$(systemunitdir)/shutdown.target shutdown.target \
$(systemunitdir)/sockets.target sockets.target \
- $(systemunitdir)/busnames.target busnames.target \
$(systemunitdir)/timers.target timers.target \
$(systemunitdir)/paths.target paths.target \
$(systemunitdir)/bluetooth.target bluetooth.target \
@@ -5389,6 +5405,11 @@ USER_UNIT_ALIASES += \
$(systemunitdir)/sound.target sound.target \
$(systemunitdir)/smartcard.target smartcard.target
+if ENABLE_KDBUS
+USER_UNIT_ALIASES += \
+ $(systemunitdir)/busnames.target busnames.target
+endif
+
GENERAL_ALIASES += \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
$(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
......@@ -88,6 +88,7 @@ initrd-parse-etc.service-ignore-return-code-of-daemo.patch
## Cherry-picked patches:
util-avoid-considering-dpkg-temporary-files-relevant.patch
libudev-fix-symbol-version-for-udev_queue_flush-and-.patch
build-don-t-install-busname-units-and-target-if-kdbu.patch
## Debian specific patches:
Add-back-support-for-Debian-specific-config-files.patch
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment