Commit 45bc3e41 authored by Robert Ricci's avatar Robert Ricci

Check it some changes from Keith Sklower to aid in building when the

control net is not routable.
parent b36b9a2d
......@@ -71,7 +71,7 @@ $(SRCS): $(LIBSRCDIR)/patched
$(LIBSRCDIR)/patched:
@if [ -n "$(LOCALPKGHOST)" ]; then \
if [ ! `$(FETCH) http://$(LOCALPKGHOST)/downloads/$(NTFSVER).tar.gz` ]; then \
if [ `$(FETCH) http://$(LOCALPKGHOST)/downloads/$(NTFSVER).tar.gz` ]; then \
$(FETCH) http://$(PKGHOST)/downloads/$(NTFSVER).tar.gz; \
fi \
else \
......
......@@ -16,6 +16,9 @@ NS_VERSION=2.29
NS_TAR_VERSION=2.29.2
TCLCL_VERSION=1.17
NS_SRC_TARBALL=ns-allinone-$(NS_TAR_VERSION).tar.gz
LOCALPKGHOST = @OUTERBOSS_NODENAME@
PKGHOST = www.emulab.net
FETCH = fetch -m
include $(OBJDIR)/Makeconf
......@@ -47,11 +50,15 @@ ns-allinone-$(NS_VERSION):
echo "Unpacking $(NS_SRC_TARBALL)"; \
tar xfz /share/tarballs/$(NS_SRC_TARBALL); \
else \
echo "Downloading $(NS_SRC_TARBALL)"; \
wget --quiet \
http://www.emulab.net/downloads/ns-allinone-$(NS_TAR_VERSION).tar.gz; \
( echo "Downloading $(NS_SRC_TARBALL)"; \
if [ -n "$(LOCALPKGHOST)" ]; then \
$(FETCH) http://$(LOCALPKGHOST)/downloads/$(NS_SRC_TARBALL);\
fi ; \
if [ ! -s $(NS_SRC_TARBALL) ]; then \
$(FETCH) http://$(PKGHOST)/downloads/$(NS_SRC_TARBALL); \
fi ;\
echo "Unpacking $(NS_SRC_TARBALL)"; \
tar xfz $(NS_SRC_TARBALL); \
tar xfz $(NS_SRC_TARBALL); ) \
fi
patch-ns-$(NS_VERSION):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment