diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-11-15 02:55:17 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-11-15 02:55:17 +0000 |
| commit | 78431965205eb0f1fe8a0e240dcc2c20940fb1dd (patch) | |
| tree | ea4f72e53a7f7ffc82e4a307de9cc80e939de3f7 /make | |
| parent | cad581084a1d85f4fb88b466e6f36ad0128754f0 (diff) | |
| download | buildroot-novena-78431965205eb0f1fe8a0e240dcc2c20940fb1dd.tar.gz buildroot-novena-78431965205eb0f1fe8a0e240dcc2c20940fb1dd.zip | |
Add udhcp, cleanup a few other loose ends.
-Erik
Diffstat (limited to 'make')
| -rw-r--r-- | make/bash.mk | 1 | ||||
| -rw-r--r-- | make/gcc_target.mk | 3 | ||||
| -rw-r--r-- | make/openssh.mk | 2 | ||||
| -rw-r--r-- | make/udhcp.mk | 38 |
4 files changed, 23 insertions, 21 deletions
diff --git a/make/bash.mk b/make/bash.mk index a5a9cff5f..de9d61b5f 100644 --- a/make/bash.mk +++ b/make/bash.mk @@ -33,6 +33,7 @@ $(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(BASH_DIR) install mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/ + (cd $(TARGET_DIR)/bin; ln -fs bash sh) rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/junk bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY) diff --git a/make/gcc_target.mk b/make/gcc_target.mk index 532d77c31..ab940fe9d 100644 --- a/make/gcc_target.mk +++ b/make/gcc_target.mk @@ -137,7 +137,8 @@ $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled PATH=$$PATH:$(STAGING_DIR)/bin $(MAKE) DESTDIR=$(TARGET_DIR) prefix=$(TARGET_DIR)/usr \ -C $(GCC_BUILD_DIR3) install; - rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc \ + $(TARGET_DIR)/usr/share/locale -$(STRIP) $(TARGET_DIR)/bin/* -$(STRIP) $(TARGET_DIR)/usr/bin/* diff --git a/make/openssh.mk b/make/openssh.mk index 3e4e5a525..ff985dcfc 100644 --- a/make/openssh.mk +++ b/make/openssh.mk @@ -34,7 +34,7 @@ $(OPENSSH_DIR)/ssh: $(OPENSSH_DIR)/.configured $(TARGET_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh make CC=$(TARGET_CC1) DESTDIR=$(TARGET_DIR) -C $(OPENSSH_DIR) install - rm -rf $(TARGET_DIR)/usr/share/doc/openssh + rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc openssh: $(TARGET_DIR)/usr/bin/ssh diff --git a/make/udhcp.mk b/make/udhcp.mk index cd5ab2fd9..1a98b1e17 100644 --- a/make/udhcp.mk +++ b/make/udhcp.mk @@ -20,37 +20,37 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -UDHCP_DIR:=$(BUILD_DIR)/udhcp -#UDHCP_SOURCE:=udhcp-0.9.6.tar.gz -#UDHCP_SITE:=http://udhcp.busybox.net/downloads/ -#$(DL_DIR)/$(UDHCP_SOURCE): -# wget -P $(DL_DIR) $(UDHCP_SITE)/$(UDHCP_SOURCE) +UDHCP_SOURCE:=udhcp-0.9.8.tar.gz +UDHCP_SITE:=http://udhcp.busybox.net/downloads/ +UDHCP_DIR:=$(BUILD_DIR)/udhcp-0.9.8 -#udhcp-source: $(DL_DIR)/$(UDHCP_SOURCE) +$(DL_DIR)/$(UDHCP_SOURCE): + wget -P $(DL_DIR) $(UDHCP_SITE)/$(UDHCP_SOURCE) -#$(UDHCP_DIR)/Makefile: $(DL_DIR)/$(UDHCP_SOURCE) -# zcat $(DL_DIR)/$(UDHCP_SOURCE) | tar -C $(BUILD_DIR) -xvf - -# touch $(UDHCP_DIR)/Makefile +udhcp-source: $(DL_DIR)/$(UDHCP_SOURCE) -$(UDHCP_DIR)/Makefile: - (cd $(BUILD_DIR); \ - cvs -z3 -d:pserver:anonymous@busybox.net:/var/cvs co udhcp ) +$(UDHCP_DIR)/.unpacked: $(DL_DIR)/$(UDHCP_SOURCE) + zcat $(DL_DIR)/$(UDHCP_SOURCE) | tar -C $(BUILD_DIR) -xvf - + touch $(UDHCP_DIR)/.unpacked -$(UDHCP_DIR)/udhcpc: $(UDHCP_DIR)/Makefile - make CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(UDHCP_DIR) +#$(UDHCP_DIR)/.unpacked: +# (cd $(BUILD_DIR); \ +# CVS_PASSFILE=$(CVS_PASSFILE) \ +# cvs -z3 -d:pserver:anonymous@busybox.net:/var/cvs co udhcp ) +# touch $(UDHCP_DIR)/.unpacked + +$(UDHCP_DIR)/udhcpc: $(UDHCP_DIR)/.unpacked + $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(UDHCP_DIR) $(TARGET_DIR)/sbin/udhcpc: $(UDHCP_DIR)/udhcpc - perl -i -p -e 's/pump/udhcpc/' $(TARGET_DIR)/etc/pcmcia/network* - perl -i -p -e 's/PUMP/UDHCPC/' $(TARGET_DIR)/etc/pcmcia/network* - perl -i -p -e 's/DHCP="n"/DHCP="y"/' $(TARGET_DIR)/etc/pcmcia/network* cp $(UDHCP_DIR)/udhcpc $(TARGET_DIR)/sbin/ -udhcp: uclibc pcmcia $(TARGET_DIR)/sbin/udhcpc +udhcp: uclibc $(TARGET_DIR)/sbin/udhcpc udhcp-clean: rm -f $(TARGET_DIR)/sbin/udhcpc - -make -C $(UDHCP_DIR) clean + -$(MAKE) -C $(UDHCP_DIR) clean udhcp-dirclean: rm -rf $(UDHCP_DIR) |