Skip to contentSkip to conversation

package/dhcp: fix target installation

PATCH New unixmania at gmail.com 3 participants 3 messages Jul 24, 2019 – Aug 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/dhcp: fix target installation

From: Carlos Santos <[email protected]>

We don't use "make install" for the target installation so we must pick the executables from the ".libs" directories on which libtool generates them otherwise we install the automatically generated wrapper scripts.

This was not necessary before the upgrade to version 4.4.1.

---
Chancgs v1->v2
Add link to gug report

---
 package/dhcp/dhcp.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/dhcp/dhcp.mk +3 -3
index 1cef9724bd..86f5c69a77 100644
@@ -44,7 +44,7 @@ ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)
 define DHCP_INSTALL_SERVER
 	mkdir -p $(TARGET_DIR)/var/lib
 	(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
-	$(INSTALL) -m 0755 -D $(@D)/server/dhcpd $(TARGET_DIR)/usr/sbin/dhcpd
+	$(INSTALL) -m 0755 -D $(@D)/server/.libs/dhcpd $(TARGET_DIR)/usr/sbin/dhcpd
 	$(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf \
 		$(TARGET_DIR)/etc/dhcp/dhcpd.conf
 endef
@@ -54,7 +54,7 @@ ifeq ($(BR2_PACKAGE_DHCP_RELAY),y)
 define DHCP_INSTALL_RELAY
 	mkdir -p $(TARGET_DIR)/var/lib
 	(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
-	$(INSTALL) -m 0755 -D $(DHCP_DIR)/relay/dhcrelay \
+	$(INSTALL) -m 0755 -D $(DHCP_DIR)/relay/.libs/dhcrelay \
 		$(TARGET_DIR)/usr/sbin/dhcrelay
 endef
 endif
@@ -63,7 +63,7 @@ ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
 define DHCP_INSTALL_CLIENT
 	mkdir -p $(TARGET_DIR)/var/lib
 	(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
-	$(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \
+	$(INSTALL) -m 0755 -D $(DHCP_DIR)/client/.libs/dhclient \
 		$(TARGET_DIR)/sbin/dhclient
 	$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \
 		$(TARGET_DIR)/etc/dhcp/dhclient.conf
Signature · 1 line
2.18.1
#1 lore raw

PATCH v2 1/1 package/dhcp: fix target installation

Quoted 10 lines · On Wed, 24 Jul 2019 07:54:53 -0300 unixmania at gmail.com wrote:

From: Carlos Santos <[email protected]>

We don't use "make install" for the target installation so we must pick the executables from the ".libs" directories on which libtool generates them otherwise we install the automatically generated wrapper scripts.

This was not necessary before the upgrade to version 4.4.1.

Quoted 7 lines

---
Chancgs v1->v2
Add link to gug report

---
 package/dhcp/dhcp.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks. I am not thrilled by the solution though, and I'm wondering if using make install + removing what we don't want wouldn't be a nicer solution, but I'm not sure.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 package/dhcp: fix target installation

In reply to unixmania at gmail.com
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"unixmania" == unixmania <[email protected]> writes:

From: Carlos Santos <[email protected]>
We don't use "make install" for the target installation so we must pick the executables from the ".libs" directories on which libtool generates them otherwise we install the automatically generated wrapper scripts.

This was not necessary before the upgrade to version 4.4.1.

Committed to 2019.05.x (2019.02.x does not use 4.4.1), thanks.

Signature · 1 line
Bye, Peter Korsgaard