浏览代码

package/rauc: only install systemd service if built with dbus/service support

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 <nunojpg@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Nuno Gonçalves 3 年之前
父节点
当前提交
ec532199d6
共有 1 个文件被更改,包括 12 次插入11 次删除
  1. 12 11
      package/rauc/rauc.mk

+ 12 - 11
package/rauc/rauc.mk

@@ -15,6 +15,18 @@ RAUC_DEPENDENCIES = host-pkgconf openssl libglib2
 ifeq ($(BR2_PACKAGE_RAUC_DBUS),y)
 ifeq ($(BR2_PACKAGE_RAUC_DBUS),y)
 RAUC_CONF_OPTS += --enable-service
 RAUC_CONF_OPTS += --enable-service
 RAUC_DEPENDENCIES += dbus
 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
 else
 RAUC_CONF_OPTS += --disable-service
 RAUC_CONF_OPTS += --disable-service
 endif
 endif
@@ -33,17 +45,6 @@ else
 RAUC_CONF_OPTS += --disable-json
 RAUC_CONF_OPTS += --disable-json
 endif
 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_RAUC_DEPENDENCIES = \
 	host-pkgconf \
 	host-pkgconf \
 	host-openssl \
 	host-openssl \