Skip to contentSkip to conversation

dnsmasq: install DBus configuration file

PATCH Superseded Yegor Yefremov 2 participants 4 messages Dec 30, 2014 – Dec 31, 2014

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Yegor Yefremov

author
#0 lore raw

PATCH v2 1/1 dnsmasq: install DBus configuration file

Signed-off-by Yegor Yefremov <[email protected]>

---
Changes:
v2: fix indentation

 package/dnsmasq/dnsmasq.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/dnsmasq/dnsmasq.mk +8 -0
index 9b1092e..1de4439 100644
@@ -101,9 +101,17 @@ define DNSMASQ_BUILD_CMDS
 	$(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N)
 endef
 
+ifeq ($(BR2_PACKAGE_DBUS),y)
+define DNSMASQ_INSTALL_DBUS
+	$(INSTALL) -D $(@D)/dbus/dnsmasq.conf \
+		$(TARGET_DIR)/etc/dbus-1/system.d/dnsmasq.conf
+endef
+endif
+
 define DNSMASQ_INSTALL_TARGET_CMDS
 	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) install$(DNSMASQ_I18N)
 	mkdir -p $(TARGET_DIR)/var/lib/misc/
+	$(DNSMASQ_INSTALL_DBUS)
 endef
 
 define DNSMASQ_INSTALL_INIT_SYSV
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH v2 1/1 dnsmasq: install DBus configuration file

Dear Yegor Yefremov,

package/dnsmasq/dnsmasq.mk define DNSMASQ_BUILD_CMDS · line 107

Quoted 4 lines · Yegor Yefremov
package/dnsmasq/dnsmasq.mk +4 -0
+ifeq ($(BR2_PACKAGE_DBUS),y)
+define DNSMASQ_INSTALL_DBUS
+	$(INSTALL) -D $(@D)/dbus/dnsmasq.conf \
+		$(TARGET_DIR)/etc/dbus-1/system.d/dnsmasq.conf

Sorry, should have said that on the previous iteration: please add -m 0644 to the $(INSTALL) invocation.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH v2 1/1 dnsmasq: install DBus configuration file

Quoted 11 lines · Thomas Petazzoni

Dear Yegor Yefremov,

package/dnsmasq/dnsmasq.mk define DNSMASQ_BUILD_CMDS · line 107

Quoted 4 lines · Yegor Yefremov
package/dnsmasq/dnsmasq.mk +4 -0
+ifeq ($(BR2_PACKAGE_DBUS),y)
+define DNSMASQ_INSTALL_DBUS
+     $(INSTALL) -D $(@D)/dbus/dnsmasq.conf \
+             $(TARGET_DIR)/etc/dbus-1/system.d/dnsmasq.conf

Sorry, should have said that on the previous iteration: please add -m 0644 to the $(INSTALL) invocation.

Should I apply these changes to wpa_supplicant too? I borrowed the code there.

Yegor

#3 lore raw

PATCH v2 1/1 dnsmasq: install DBus configuration file

Dear Yegor Yefremov,

Quoted 4 lines · Yegor Yefremov
Quoted 2 lines

Sorry, should have said that on the previous iteration: please add -m 0644 to the $(INSTALL) invocation.

Should I apply these changes to wpa_supplicant too? I borrowed the code there.

Yes, doing those changes on wpa_supplicant would be good. Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com