Commit 2a833646 authored by Mike Hibler's avatar Mike Hibler

Move newnode MFS scripts/tools to clientside directory.

install/newclient -> clientside/tmcc/freebsd/newclient
tools/teachswitch -> clientside/tools/teachswitch

These only get built/installed as part of a "newnode-mfs" build/install.
parent 0399cd8e
...@@ -4512,6 +4512,7 @@ outfiles="Makeconf GNUmakefile setversion \ ...@@ -4512,6 +4512,7 @@ outfiles="Makeconf GNUmakefile setversion \
event/delay-agent/GNUmakefile \ event/delay-agent/GNUmakefile \
tools/GNUmakefile \ tools/GNUmakefile \
tools/pcapper/GNUmakefile \ tools/pcapper/GNUmakefile \
tools/teachswitch/GNUmakefile \
sensors/GNUmakefile \ sensors/GNUmakefile \
sensors/slothd/GNUmakefile \ sensors/slothd/GNUmakefile \
sensors/canaryd/GNUmakefile \ sensors/canaryd/GNUmakefile \
......
...@@ -249,6 +249,7 @@ outfiles="Makeconf GNUmakefile setversion \ ...@@ -249,6 +249,7 @@ outfiles="Makeconf GNUmakefile setversion \
event/delay-agent/GNUmakefile \ event/delay-agent/GNUmakefile \
tools/GNUmakefile \ tools/GNUmakefile \
tools/pcapper/GNUmakefile \ tools/pcapper/GNUmakefile \
tools/teachswitch/GNUmakefile \
sensors/GNUmakefile \ sensors/GNUmakefile \
sensors/slothd/GNUmakefile \ sensors/slothd/GNUmakefile \
sensors/canaryd/GNUmakefile \ sensors/canaryd/GNUmakefile \
......
# #
# Copyright (c) 2000-2014 University of Utah and the Flux Group. # Copyright (c) 2000-2015 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -166,7 +166,7 @@ cdboot-install: destdircheck common-install etc-install \ ...@@ -166,7 +166,7 @@ cdboot-install: destdircheck common-install etc-install \
(cd ../../os; $(MAKE) DESTDIR=$(DESTDIR) cdboot-install) (cd ../../os; $(MAKE) DESTDIR=$(DESTDIR) cdboot-install)
(cd ../../cdrom;$(MAKE) DESTDIR=$(DESTDIR) client-install) (cd ../../cdrom;$(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../tools/teachswitch; $(MAKE) DESTDIR=$(DESTDIR) client-install) (cd ../../tools/teachswitch; $(MAKE) DESTDIR=$(DESTDIR) client-install)
$(INSTALL) -m 755 $(SRCDIR)/../../install/newclient $(BINDIR)/newclient $(INSTALL) -m 755 $(SRCDIR)/newclient $(BINDIR)/newclient
$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/users $(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/users
$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/proj $(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/proj
$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/groups $(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/groups
......
# #
# Copyright (c) 2000-2012 University of Utah and the Flux Group. # Copyright (c) 2000-2015 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -159,8 +159,8 @@ mfs-install: destdircheck ...@@ -159,8 +159,8 @@ mfs-install: destdircheck
fi fi
newnode-mfs-install: mfs-install newnode-mfs-install: mfs-install
(cd ../../../tools/teachswitch; $(MAKE) DESTDIR=$(DESTDIR) client-install) (cd ../../tools/teachswitch; $(MAKE) DESTDIR=$(DESTDIR) client-install)
$(INSTALL) -m 755 $(SRCDIR)/../../../install/newclient $(BINDIR)/newclient $(INSTALL) -m 755 $(SRCDIR)/../freebsd/newclient $(BINDIR)/newclient
$(INSTALL) -m 755 $(SRCDIR)/mfs-newnode-testbed.sh $(RCDIR)/testbed.sh $(INSTALL) -m 755 $(SRCDIR)/mfs-newnode-testbed.sh $(RCDIR)/testbed.sh
# #
......
...@@ -177,6 +177,6 @@ mfs-install: destdircheck ...@@ -177,6 +177,6 @@ mfs-install: destdircheck
fi fi
newnode-mfs-install: mfs-install newnode-mfs-install: mfs-install
(cd ../../../tools/teachswitch; $(MAKE) DESTDIR=$(DESTDIR) client-install) (cd ../../tools/teachswitch; $(MAKE) DESTDIR=$(DESTDIR) client-install)
$(INSTALL) -m 755 $(SRCDIR)/../../../install/newclient $(BINDIR)/newclient $(INSTALL) -m 755 $(SRCDIR)/../freebsd/newclient $(BINDIR)/newclient
$(INSTALL) -m 755 $(SRCDIR)/mfs-newnode-testbed.sh $(RCDIR)/testbed.sh $(INSTALL) -m 755 $(SRCDIR)/mfs-newnode-testbed.sh $(RCDIR)/testbed.sh
...@@ -123,29 +123,6 @@ frisbee-mfs-install: destdircheck ...@@ -123,29 +123,6 @@ frisbee-mfs-install: destdircheck
rm -f $(BINDIR)/rc/rc.mkelab rm -f $(BINDIR)/rc/rc.mkelab
rm -f $(RCDIR)/elvind.sh rm -f $(RCDIR)/elvind.sh
cdboot-install: destdircheck common-install etc-install \
script-install bin-install
$(INSTALL) -m 755 $(SRCDIR)/cdboot/rc.cdboot $(BINDIR)/rc/rc.cdboot
$(INSTALL) -m 755 $(SRCDIR)/rc.frisbee $(BINDIR)/rc/rc.frisbee
$(INSTALL) -m 755 $(SRCDIR)/slicefix $(BINDIR)/slicefix
#cp $(SRCDIR)/cdboot/fstab $(SYSETCDIR)/fstab
#cp $(SRCDIR)/cdboot/fstab.lbs $(SYSETCDIR)/fstab.lbs
#$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/boot
#cp $(SRCDIR)/cdboot/loader.conf $(DESTDIR)/boot/loader.conf
#cp $(SRCDIR)/cdboot/loader.rc.lbs $(DESTDIR)/boot/loader.rc.lbs
#cp $(SRCDIR)/cdboot/.profile $(DESTDIR)/.profile
echo >$(ISMFS) "This file indicates its the MFS. DO NOT DELETE!"
(cd ../../sensors/slothd; $(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../pxe; $(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../os; $(MAKE) DESTDIR=$(DESTDIR) cdboot-install)
(cd ../../cdrom;$(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../tools/teachswitch; $(MAKE) DESTDIR=$(DESTDIR) client-install)
$(INSTALL) -m 755 $(SRCDIR)/../../install/newclient $(BINDIR)/newclient
#$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/users
#$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/proj
#$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/groups
#$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/share
simple-install: common-install script-install bin-install simple-install: common-install script-install bin-install
dir-install: dir-install:
......
# #
# Copyright (c) 2000-2012 University of Utah and the Flux Group. # Copyright (c) 2000-2015 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -53,8 +53,12 @@ mfs: ...@@ -53,8 +53,12 @@ mfs:
mfs-install: mfs-install:
frisbee-mfs: frisbee-mfs:
frisbee-mfs-install: frisbee-mfs-install:
newnode-mfs: newnode-mfs:
newnode-mfs-install: @$(MAKE) -C teachswitch all
newnode-mfs-install: newnode-mfs
@$(MAKE) -C teachswitch client-install
# How to recursively descend into subdirectories to make general # How to recursively descend into subdirectories to make general
# targets such as `all'. # targets such as `all'.
......
...@@ -6965,7 +6965,6 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -6965,7 +6965,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
rc.d/3.elvin_gateway.sh rc.d/pelab.sh rc.d/capture.sh \ rc.d/3.elvin_gateway.sh rc.d/pelab.sh rc.d/capture.sh \
rc.d/3.mfrisbeed.sh rc.d/3.mfrisbeed-subboss.sh \ rc.d/3.mfrisbeed.sh rc.d/3.mfrisbeed-subboss.sh \
tools/GNUmakefile rc.d/1.mysql-server.sh tools/svn/GNUmakefile \ tools/GNUmakefile rc.d/1.mysql-server.sh tools/svn/GNUmakefile \
tools/teachswitch/GNUmakefile \
tools/webcamapplet/GNUmakefile tools/whol/GNUmakefile \ tools/webcamapplet/GNUmakefile tools/whol/GNUmakefile \
tools/selectapplet/GNUmakefile tools/rmanage/GNUmakefile \ tools/selectapplet/GNUmakefile tools/rmanage/GNUmakefile \
$eventfiles \ $eventfiles \
...@@ -7051,6 +7050,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \ ...@@ -7051,6 +7050,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/event/program-agent/GNUmakefile \ clientside/event/program-agent/GNUmakefile \
clientside/event/disk-agent/GNUmakefile \ clientside/event/disk-agent/GNUmakefile \
clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \ clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \
clientside/tools/teachswitch/GNUmakefile \
clientside/sensors/GNUmakefile clientside/sensors/slothd/GNUmakefile \ clientside/sensors/GNUmakefile clientside/sensors/slothd/GNUmakefile \
clientside/sensors/slothd/sdisrunning clientside/sensors/slothd/sddeploy \ clientside/sensors/slothd/sdisrunning clientside/sensors/slothd/sddeploy \
clientside/sensors/canaryd/GNUmakefile \ clientside/sensors/canaryd/GNUmakefile \
......
...@@ -1335,7 +1335,6 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -1335,7 +1335,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
rc.d/3.elvin_gateway.sh rc.d/pelab.sh rc.d/capture.sh \ rc.d/3.elvin_gateway.sh rc.d/pelab.sh rc.d/capture.sh \
rc.d/3.mfrisbeed.sh rc.d/3.mfrisbeed-subboss.sh \ rc.d/3.mfrisbeed.sh rc.d/3.mfrisbeed-subboss.sh \
tools/GNUmakefile rc.d/1.mysql-server.sh tools/svn/GNUmakefile \ tools/GNUmakefile rc.d/1.mysql-server.sh tools/svn/GNUmakefile \
tools/teachswitch/GNUmakefile \
tools/webcamapplet/GNUmakefile tools/whol/GNUmakefile \ tools/webcamapplet/GNUmakefile tools/whol/GNUmakefile \
tools/selectapplet/GNUmakefile tools/rmanage/GNUmakefile \ tools/selectapplet/GNUmakefile tools/rmanage/GNUmakefile \
$eventfiles \ $eventfiles \
...@@ -1421,6 +1420,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \ ...@@ -1421,6 +1420,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/event/program-agent/GNUmakefile \ clientside/event/program-agent/GNUmakefile \
clientside/event/disk-agent/GNUmakefile \ clientside/event/disk-agent/GNUmakefile \
clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \ clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \
clientside/tools/teachswitch/GNUmakefile \
clientside/sensors/GNUmakefile clientside/sensors/slothd/GNUmakefile \ clientside/sensors/GNUmakefile clientside/sensors/slothd/GNUmakefile \
clientside/sensors/slothd/sdisrunning clientside/sensors/slothd/sddeploy \ clientside/sensors/slothd/sdisrunning clientside/sensors/slothd/sddeploy \
clientside/sensors/canaryd/GNUmakefile \ clientside/sensors/canaryd/GNUmakefile \
......
# #
# Copyright (c) 2000-2011 University of Utah and the Flux Group. # Copyright (c) 2000-2015 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -29,7 +29,7 @@ ISMAINSITE = @TBMAINSITE@ ...@@ -29,7 +29,7 @@ ISMAINSITE = @TBMAINSITE@
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = teachswitch webcamapplet whol svn SUBDIRS = webcamapplet whol svn
ifeq ($(ISMAINSITE),1) ifeq ($(ISMAINSITE),1)
SUBDIRS += rmanage SUBDIRS += rmanage
endif endif
......
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