| Message ID | 20190724105453.4233-1-unixmania@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] package/dhcp: fix target installation | expand |
On Wed, 24 Jul 2019 07:54:53 -0300 unixmania@gmail.com wrote: > From: Carlos Santos <unixmania@gmail.com> > > 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> > --- > 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
>>>>> "unixmania" == unixmania <unixmania@gmail.com> writes: > From: Carlos Santos <unixmania@gmail.com> > 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 Committed to 2019.05.x (2019.02.x does not use 4.4.1), thanks.
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