aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Santos <unixmania@gmail.com>2019-07-24 07:54:53 -0300
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2019-08-01 18:26:09 +0200
commitffe5fcadfcd42af8a582b8f5fe49b56900b43a51 (patch)
tree337b019d04eaa61b4dce20b362819aee20443fb5
parent2405cd042ab38f5a8b3fea5b426453540a61d761 (diff)
downloadbuildroot-ffe5fcadfcd42af8a582b8f5fe49b56900b43a51.tar.bz2
package/dhcp: fix target installation
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. Fixes: https://bugs.busybox.net/show_bug.cgi?id=12051 Signed-off-by: Carlos Santos <unixmania@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/dhcp/dhcp.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 1cef9724bd..86f5c69a77 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -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