diff options
| author | Eric Andersen <andersen@codepoet.org> | 2005-03-09 17:45:21 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2005-03-09 17:45:21 +0000 |
| commit | dccecf52b00eb3aa941b3111d41f60689088003b (patch) | |
| tree | e237cd62c1572aed819df0f4f141110c9b675312 | |
| parent | d47108caf6e630f24fde37c439c1db31d209b25a (diff) | |
Fix http://bugs.uclibc.org/view.php?id=135
The ISC DHCP package only install the dhcrelay binary. Patch
supplied to install server and client too, as configured.
| -rw-r--r-- | package/dhcp/dhcp.mk | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index f0ce972dc..dadb40a4b 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -8,7 +8,9 @@ DHCP_SOURCE:=dhcp-$(DHCP_VER).tar.gz DHCP_SITE:=ftp://ftp.isc.org/isc/dhcp DHCP_CAT:=zcat DHCP_DIR:=$(BUILD_DIR)/dhcp-$(DHCP_VER) +DHCP_SERVER_BINARY:=work.linux-2.2/server/dhcpd DHCP_RELAY_BINARY:=work.linux-2.2/relay/dhcrelay +DHCP_CLIENT_BINARY:=work.linux-2.2/client/dhclient DHCP_SERVER_TARGET_BINARY:=usr/sbin/dhcpd DHCP_RELAY_TARGET_BINARY:=usr/sbin/dhcrelay DHCP_CLIENT_TARGET_BINARY:=usr/sbin/dhclient @@ -36,7 +38,7 @@ $(DHCP_DIR)/$(DHCP_RELAY_BINARY): $(DHCP_DIR)/.configured $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) (cd $(TARGET_DIR)/var/lib; ln -sf /tmp dhcp) - $(INSTALL) -m 0755 -D $(DHCP_DIR)/dhcpd $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY) + $(INSTALL) -s -m 0755 -D $(DHCP_DIR)/$(DHCP_SERVER_BINARY) $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY) $(INSTALL) -m 0755 -D package/dhcp/init-server $(TARGET_DIR)/etc/init.d/S80dhcp-server $(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf $(TARGET_DIR)/etc/dhcp/dhcpd.conf $(INSTALL) -m 0644 -D package/dhcp/default-server $(TARGET_DIR)/etc/default/dhcp-server @@ -45,7 +47,7 @@ $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) (cd $(TARGET_DIR)/var/lib; ln -sf /tmp dhcp) - $(INSTALL) -m 0755 -D $(DHCP_DIR)/work.linux-2.2/relay/dhcrelay $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY) + $(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY) $(INSTALL) -m 0755 -D package/dhcp/init-relay $(TARGET_DIR)/etc/init.d/S80dhcp-relay $(INSTALL) -m 0644 -D package/dhcp/default-relay $(TARGET_DIR)/etc/default/dhcp-relay rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ @@ -53,8 +55,8 @@ $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) (cd $(TARGET_DIR)/var/lib; ln -sf /tmp dhcp) - $(INSTALL) -m 0755 -D $(DHCP_DIR)/dhclient $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY) - $(INSTALL) -m 0644 -D $(DHCP_DIR)/dhclient.conf $(TARGET_DIR)/etc/dhcp/dhclient.conf + $(INSTALL) -s -m 0755 -D $(DHCP_DIR)/$(DHCP_CLIENT_BINARY) $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY) + $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf $(TARGET_DIR)/etc/dhcp/dhclient.conf rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc @@ -76,15 +78,15 @@ dhcp-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_ISC_DHCP)),y) -TARGETS+=dhcp -endif +#ifeq ($(strip $(BR2_PACKAGE_ISC_DHCP)),y) +#TARGETS+=dhcp +#endif ifeq ($(strip $(BR2_PACKAGE_DHCP_SERVER)),y) -TARGETS+=dhcp_relay +TARGETS+=dhcp_server endif ifeq ($(strip $(BR2_PACKAGE_DHCP_RELAY)),y) TARGETS+=dhcp_relay endif ifeq ($(strip $(BR2_PACKAGE_DHCP_CLIENT)),y) -TARGETS+=dhcp_relay +TARGETS+=dhcp_client endif |