From ec532199d6b404a1e51b5ed0dfdb21b18a8a3ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Gon=C3=A7alves?= Date: Sun, 27 Feb 2022 19:54:14 +0000 Subject: [PATCH] package/rauc: only install systemd service if built with dbus/service support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The systemd service will try to call rauc in service mode, so it is useless and will fail if rauc does not have such support Signed-off-by: Nuno Gonçalves Signed-off-by: Peter Korsgaard --- package/rauc/rauc.mk | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 39f5255812..7a10470cf2 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -15,6 +15,18 @@ RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) RAUC_CONF_OPTS += --enable-service RAUC_DEPENDENCIES += dbus + +# systemd service uses dbus interface +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +# configure uses pkg-config --variable=systemdsystemunitdir systemd +RAUC_DEPENDENCIES += systemd +define RAUC_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d + printf '[Install]\nWantedBy=multi-user.target\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf +endef +endif + else RAUC_CONF_OPTS += --disable-service endif @@ -33,17 +45,6 @@ else RAUC_CONF_OPTS += --disable-json endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -# configure uses pkg-config --variable=systemdsystemunitdir systemd -RAUC_DEPENDENCIES += systemd -endif - -define RAUC_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d - printf '[Install]\nWantedBy=multi-user.target\n' \ - >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf -endef - HOST_RAUC_DEPENDENCIES = \ host-pkgconf \ host-openssl \