Skip to content
Snippets Groups Projects
Commit 50a22fc9 authored by Mike Hibler's avatar Mike Hibler
Browse files

More fixes for Kevin's test environment.

parent 3dc0f289
No related branches found
No related tags found
No related merge requests found
# #
# Copyright (c) 2000-2013 University of Utah and the Flux Group. # Copyright (c) 2000-2014 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -268,7 +268,7 @@ client-src-tarball: ...@@ -268,7 +268,7 @@ client-src-tarball:
# This is not finished yet. # This is not finished yet.
client-shadow-rpm: client-shadow-rpm:
-$(RM) -rf rpmbuild -$(RM) -rf rpmbuild
$(MKDIR_P) rpmbuild/SOURCES rpmbuild/SRPMS mkdir -p rpmbuild/SOURCES rpmbuild/SRPMS
$(CP) emulab-client-src.tar.gz rpmbuild/SOURCES $(CP) emulab-client-src.tar.gz rpmbuild/SOURCES
$(RPM) -v -bs --nodeps --define='_topdir $(TOPDIR)/rpmbuild' \ $(RPM) -v -bs --nodeps --define='_topdir $(TOPDIR)/rpmbuild' \
clientside/shadow.spec clientside/shadow.spec
...@@ -470,6 +470,7 @@ undo-configure: ...@@ -470,6 +470,7 @@ undo-configure:
# They are copied over to the embryonic boss and ops during setup. # They are copied over to the embryonic boss and ops during setup.
# #
elabinelab-scripts: elabinelab-scripts:
mkdir -p $(INSTALL_TOPDIR)/etc
cp -f $(SRCDIR)/clientside/tmcc/freebsd/mkextrafs.pl $(INSTALL_TOPDIR)/etc/ cp -f $(SRCDIR)/clientside/tmcc/freebsd/mkextrafs.pl $(INSTALL_TOPDIR)/etc/
cp -f $(SRCDIR)/clientside/tmcc/common/config/rc.mkelab $(INSTALL_TOPDIR)/etc/ cp -f $(SRCDIR)/clientside/tmcc/common/config/rc.mkelab $(INSTALL_TOPDIR)/etc/
......
# #
# Copyright (c) 2000-2013 University of Utah and the Flux Group. # Copyright (c) 2000-2014 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -192,6 +192,7 @@ newnode-mfs-install: newnode-mfs ...@@ -192,6 +192,7 @@ newnode-mfs-install: newnode-mfs
# XXX argh! assumes FreeBSD inner boss # XXX argh! assumes FreeBSD inner boss
# #
elabinelabfiles: elabinelabfiles:
mkdir -p $(INSTALL_ETCDIR)
$(INSTALL_PROGRAM) $(SRCDIR)/common/config/rc.mkelab \ $(INSTALL_PROGRAM) $(SRCDIR)/common/config/rc.mkelab \
$(INSTALL_ETCDIR)/rc.mkelab $(INSTALL_ETCDIR)/rc.mkelab
$(INSTALL_PROGRAM) $(SRCDIR)/freebsd/mkextrafs.pl \ $(INSTALL_PROGRAM) $(SRCDIR)/freebsd/mkextrafs.pl \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment