diff mbox series

[4/4] package/mender: install dbus authentication file if dbus is selected

Message ID 20210320222835.3951325-5-aduskett@gmail.com
State Accepted
Headers show
Series mender updates | expand

Commit Message

Adam Duskett March 20, 2021, 10:28 p.m. UTC 
From: Adam Duskett <Aduskett@rivian.com>

While not a requirement to run mender itself, the mender-connect package
requires this file to be installed to talk to mender.

Signed-off-by: Adam Duskett <Aduskett@rivian.com>
---
 package/mender/mender.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Thomas Petazzoni March 30, 2021, 8:31 p.m. UTC | #1 
Hello Adam,

On Sat, 20 Mar 2021 15:28:35 -0700
aduskett@gmail.com wrote:

> +ifeq ($(BR2_PACKAGE_DBUS),y)
> +MENDER_DEPENDENCIES += dbus

Do we really need DBus to be built/installed before ? It seems like the
hook below only installs an extra DBus configuration file.

> +define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
> +	$(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \
> +		      $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.AuthenticationManager.conf
> +endef
> +MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
> +endif

Thanks!

Thomas
Adam Duskett March 31, 2021, 12:09 a.m. UTC | #2 
Hello Thomas!

On Tue, Mar 30, 2021 at 1:31 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello Adam,
>
> On Sat, 20 Mar 2021 15:28:35 -0700
> aduskett@gmail.com wrote:
>
> > +ifeq ($(BR2_PACKAGE_DBUS),y)
> > +MENDER_DEPENDENCIES += dbus
>
> Do we really need DBus to be built/installed before ? It seems like the
> hook below only installs an extra DBus configuration file.
>
It isn't actually. I can resubmit the patch with just the $(INSTALL)
if you want me to!

Adam
> > +define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
> > +     $(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \
> > +                   $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.AuthenticationManager.conf
> > +endef
> > +MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
> > +endif
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Thomas Petazzoni March 31, 2021, 7:23 a.m. UTC | #3 
On Tue, 30 Mar 2021 17:09:30 -0700
Adam Duskett <aduskett@gmail.com> wrote:

> > Do we really need DBus to be built/installed before ? It seems like the
> > hook below only installs an extra DBus configuration file.
> >  
> It isn't actually. I can resubmit the patch with just the $(INSTALL)
> if you want me to!

Thanks for the confirmation, I have applied the patch after dropping
the dbus dependency. Thanks!

Thomas
Peter Korsgaard April 4, 2021, 9:09 a.m. UTC | #4 
>>>>> "aduskett" == aduskett  <aduskett@gmail.com> writes:

 > From: Adam Duskett <Aduskett@rivian.com>
 > While not a requirement to run mender itself, the mender-connect package
 > requires this file to be installed to talk to mender.

 > Signed-off-by: Adam Duskett <Aduskett@rivian.com>

Committed to 2020.11.x and 2021.02.x, thanks.
diff mbox series

Patch

diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index a5b5654ff9..fc077c6fa2 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -78,6 +78,15 @@  endef
 
 MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES
 
+ifeq ($(BR2_PACKAGE_DBUS),y)
+MENDER_DEPENDENCIES += dbus
+define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
+	$(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \
+		      $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.AuthenticationManager.conf
+endef
+MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
+endif
+
 define MENDER_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender-client.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/mender-client.service