| Message ID | CAEXMXLQM7jq3REiVmSJCSAYW_p5rbwPY1+6Z2wtTSpca3AAeoA@mail.gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/rauc: only install systemd service if built with dbus/service support | expand |
>>>>> "Nuno" == Nuno Gonçalves <nunojpg@gmail.com> writes: > 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> > --- > package/rauc/rauc.mk | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk > index 39f5255812..d29ef66046 100644 > --- a/package/rauc/rauc.mk > +++ b/package/rauc/rauc.mk > @@ -15,6 +15,15 @@ RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 > ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) > RAUC_CONF_OPTS += --enable-service > RAUC_DEPENDENCIES += dbus > +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 Your mailer had corrupted the patch (tabs to spaces), so I couldn't apply the patch and had to manually fix it up. Committed, thanks.
diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 39f5255812..d29ef66046 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -15,6 +15,15 @@ RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) RAUC_CONF_OPTS += --enable-service RAUC_DEPENDENCIES += dbus +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 +42,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 \
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> --- package/rauc/rauc.mk | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)