Skip to contentSkip to conversation

package/network-manager: NM needs ISC-DHCPC or DHCPCD

PATCH Superseded Nathaniel Roach 2 participants 2 messages Nov 26, 2014

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/network-manager: NM needs ISC-DHCPC or DHCPCD

As NM communicates with the dhcp client through DBus, it doesn't support any old client.

Add the dependencies to Config.in, and ensure that they are built beforehand.

---
This adds unecessary things to static-ip configured
systems, but then again they are using NM for that (instead of ifup/down) so maybe this is a non issue?

Changes v1 -> v2:
- Switched to "select" from "depends on" (As recommended by Baruch). Uses DHCPCD as default as it's the lighter option.
- Because of the above, the edit to "NM needs ..." is no longer needed.

---
 package/network-manager/Config.in          | 1 +
 package/network-manager/network-manager.mk | 2 ++
 2 files changed, 3 insertions(+)
package/network-manager/Config.in +1 -0
index 0ed6ca5..a3e6e33 100644
@@ -8,6 +8,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	depends on BR2_USE_MMU # dbus
 	depends on BR2_PACKAGE_HAS_UDEV
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
+	select BR2_PACKAGE_DHCPCD if !BR2_PACKAGE_DHCP_CLIENT
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_GNUTLS
package/network-manager/network-manager.mk +2 -0
index 7944254..96bc858 100644
@@ -57,10 +57,12 @@ endif
 
 ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
 NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/usr/sbin/dhclient
+NETWORK_MANAGER_DEPENDENCIES += dhcp
 endif
 
 ifeq ($(BR2_PACKAGE_DHCPCD),y)
 NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/usr/sbin/dhcpcd
+NETWORK_MANAGER_DEPENDENCIES += dhcpcd
 endif
 
 # uClibc by default doesn't have backtrace support, so don't use it
Signature · 1 line
2.1.3
#1 lore raw

PATCH v2 1/1 package/network-manager: NM needs ISC-DHCPC or DHCPCD

Hi Nathaniel,

Quoted 5 lines · Nathaniel Roach

As NM communicates with the dhcp client through DBus, it doesn't support any old client.

Add the dependencies to Config.in, and ensure that they are built beforehand.

So only these two DHCP clients are supported? If so, please mention that here.

Quoted 35 lines

---
This adds unecessary things to static-ip configured
systems, but then again they are using NM for that (instead of ifup/down) so maybe this is a non issue?

Changes v1 -> v2:
- Switched to "select" from "depends on" (As recommended by Baruch). Uses DHCPCD as default as it's the lighter option.
- Because of the above, the edit to "NM needs ..." is no longer needed.

---
 package/network-manager/Config.in          | 1 +
 package/network-manager/network-manager.mk | 2 ++
 2 files changed, 3 insertions(+)
package/network-manager/Config.in +1 -0
index 0ed6ca5..a3e6e33 100644
@@ -8,6 +8,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	depends on BR2_USE_MMU # dbus
 	depends on BR2_PACKAGE_HAS_UDEV
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
+	select BR2_PACKAGE_DHCPCD if !BR2_PACKAGE_DHCP_CLIENT
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_GNUTLS
package/network-manager/network-manager.mk +0 -0
index 7944254..96bc858 100644

package/network-manager/network-manager.mk endif · line 60

Quoted 4 lines
package/network-manager/network-manager.mk +1 -0
@@ -57,10 +57,12 @@ endif
 
 ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
 NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/usr/sbin/dhclient
+NETWORK_MANAGER_DEPENDENCIES += dhcp

Are you sure this is a build time dependency?

package/network-manager/network-manager.mk endif · line 65

Quoted 5 lines
package/network-manager/network-manager.mk +1 -0
 endif
 
 ifeq ($(BR2_PACKAGE_DHCPCD),y)
 NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/usr/sbin/dhcpcd
+NETWORK_MANAGER_DEPENDENCIES += dhcpcd

Ditto.

Quoted 3 lines
package/network-manager/network-manager.mk +0 -0
 endif
 
 # uClibc by default doesn't have backtrace support, so don't use it
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -