Commit 6bfe2932 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

dhcp: fix install -D invocation in target-install 



Closes #3181

When install -D is used (to ensure destination dirs exists), the destination
file name has to be given as well.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 15f5bef0

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 
	#3007: kexec doesn't build: Missing regdef.h file

	#3103: make external-deps wants to download gcc-.tar.bz2 when...

	#3109: abnormal `make busybox-menuconfig`

	#3181: dhcp.mk copies S80dhcp-server to etc/init.d, not etc/init.d/



2010.11, Released November 30th, 2010:

package/dhcp/dhcp.mk

+10 −7
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ 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 package/dhcp/S80dhcp-server $(TARGET_DIR)/etc/init.d

	mkdir -p $(TARGET_DIR)/etc/dhcp

	$(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf $(TARGET_DIR)/etc/dhcp/dhcpd.conf

	$(INSTALL) -m 0755 -D package/dhcp/S80dhcp-server \

		$(TARGET_DIR)/etc/init.d/S80dhcp-server

	$(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf \

		$(TARGET_DIR)/etc/dhcp/dhcpd.conf

endef

endif
@@ -31,8 +32,10 @@ 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 $(TARGET_DIR)/usr/sbin/

	$(INSTALL) -m 0755 -D package/dhcp/S80dhcp-relay $(TARGET_DIR)/etc/init.d

	$(INSTALL) -m 0755 -D $(DHCP_DIR)/relay/dhcrelay \

		$(TARGET_DIR)/usr/sbin/dhcrelay

	$(INSTALL) -m 0755 -D package/dhcp/S80dhcp-relay \

		$(TARGET_DIR)/etc/init.d/S80dhcp-relay

endef

endif
@@ -40,8 +43,8 @@ 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 $(TARGET_DIR)/usr/sbin

	mkdir -p $(TARGET_DIR)/etc/dhcp

	$(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \

		$(TARGET_DIR)/usr/sbin/dhclient

	$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \

		$(TARGET_DIR)/etc/dhcp/dhclient.conf

	$(INSTALL) -m 0755 -D package/dhcp/dhclient-script \