Commit 3546c6e3 authored by Mike Hibler's avatar Mike Hibler

Make subboss and subboss-install targets closer to correct.

parent 2963f926
......@@ -226,20 +226,24 @@ ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C tip client-install
endif
subboss: client
subboss:
@$(MAKE) -C clientside subboss
@$(MAKE) -C os subboss
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client
@$(MAKE) -C tip client
endif
@$(MAKE) -C utils subboss
subboss-install: subboss
@$(MAKE) -C clientside client-install
@$(MAKE) -C clientside subboss-install
@$(MAKE) -C os subboss-install
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client-install
@$(MAKE) -C tip client-install
endif
@$(MAKE) -C utils subboss-install
@$(MAKE) -C os subboss-install
@$(MAKE) -C db subboss-install
@$(MAKE) -C clientside/tmcc subboss-install
@$(MAKE) -C rc.d subboss-install
@$(MAKE) -C dhcpd subboss-install
# Hack: this should probably be done by a subboss-install
......
......@@ -46,7 +46,7 @@ client: client-subdirs
client-install: client client-mkdirs client-install-subdirs client-setversion
control-install: control-install-subdirs
subboss: subboss-subdirs
subboss-install: client subboss-install-subdirs
subboss-install: client client-mkdirs subboss-install-subdirs
post-install: post-install-subdirs
clean: clean-subdirs
distclean: distclean-subdirs
......
......@@ -55,12 +55,15 @@ all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
subboss: client
subboss-install:
@$(MAKE) -C program-agent client-install
@$(MAKE) -C proxy client-install
boss-install: boss-install-subdirs
client: client-subdirs
client-install: client client-install-subdirs
control-install: control-install-subdirs
subboss:
subboss-install:
post-install: post-install-subdirs
clean: clean-subdirs
distclean: distclean-subdirs
......
......@@ -38,8 +38,8 @@ install: install-subdirs
boss-install: install-subdirs
control-install: control-install-subdirs
client-install: client-install-subdirs
subboss:
subboss-install:
subboss: client
subboss-install: client-install
clean: clean-subdirs
distclean: distclean-subdirs
mfs:
......
......@@ -75,9 +75,6 @@ ifeq ($(SYSTEM),FreeBSD)
$(MAKE) -C growdisk client-install
endif
subboss: client
mfs:
$(MAKE) -C growdisk client
$(MAKE) -C zapdisk mfs
......@@ -85,11 +82,13 @@ mfs:
$(MAKE) -C imagezip client
$(MAKE) -C frisbee.redux client
subboss-install: subboss client-install
ifeq ($(SYSTEM),FreeBSD)
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C frisbee.redux subboss-install
else
CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C frisbee.redux subboss-install
subboss: subboss-subdirs
subboss-install: subboss
$(MAKE) -C genhostsfile subboss-install
ifneq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT) # Filter out again...
$(MAKE) -C imagezip client-install
$(MAKE) -C frisbee.redux subboss-install
endif
remote-install:
......
#
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -48,6 +48,8 @@ dijkstra-debug: Compressor.o TreeCompressor.o dijkstra.o \
boss-install:
control-install:
subboss:
subboss-install:
client: all
client-install: client
$(INSTALL_PROGRAM) dijkstra$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/dijkstra$(EXE)
......
#
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -41,6 +41,8 @@ wgraph.o: wgraph.cc wgraph.h
boss-install: $(INSTALL_LIBEXECDIR)/genhostsfile
control-install:
subboss: client
subboss-install: client-install
client: genhostsfile
client-install: client
$(INSTALL_PROGRAM) genhostsfile$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/genhostsfile$(EXE)
......
......@@ -40,6 +40,9 @@ growdisk: growdisk.o
install:
subboss:
subboss-install:
client: all
client-install: client
$(INSTALL_PROGRAM) -s growdisk$(EXE) $(DESTDIR)$(CLIENT_BINDIR)$(EXE)
......
......@@ -242,6 +242,8 @@ version.c: imagezip.c imageunzip.c imagedump.c
install: $(addprefix $(INSTALL_BINDIR)/, $(PROGS))
boss-install: install
subboss: all
subboss-install: subboss
client: all
client-install: client
......
......@@ -55,6 +55,8 @@ boss-install:
$(INSTALL_DIR)/opsdir/man/man1/emulab-sync.1
control-install:
subboss:
subboss-install:
client: all
client-install: client
......
......@@ -32,6 +32,9 @@ all: fullclient client
fullclient: tmcc
client: tmcc-nossl findif dostype
# for subboss we use the full SSL tmcc
subboss: tmcc findif dostype
# For VPATH.
MOSTLY_SRCDIRS = ${TESTBED_LIBSRCDIR}/libtb \
${TESTBED_LIBSRCDIR}/tmcd
......@@ -158,7 +161,7 @@ boss-install: $(INSTALL_SBINDIR)/findif \
control-install: tmcc
@$(MAKE) -C freebsd control-install
subboss-install: client
subboss-install: subboss
@$(MAKE) -C $(MDSUBDIR) subboss-install
client-install: client
......
#
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -111,13 +111,9 @@ subboss-common-script-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/watchdog $(BINDIR)/watchdog
$(INSTALL) -m 755 $(SRCDIR)/ntpstart $(BINDIR)/ntpstart
$(INSTALL) -m 755 $(SRCDIR)/runstartup $(BINDIR)/runstartup
$(INSTALL) -m 755 $(SRCDIR)/runcvsup.sh $(BINDIR)/runcvsup.sh
$(INSTALL) -m 755 $(SRCDIR)/update $(BINDIR)/update
$(INSTALL) -m 755 $(SRCDIR)/ifsetup $(BINDIR)/ifsetup
$(INSTALL) -m 755 $(SRCDIR)/ifdynconfig $(BINDIR)/ifdynconfig
$(INSTALL) -m 755 $(SRCDIR)/vnodesetup $(BINDIR)/vnodesetup
$(INSTALL) -m 755 $(SRCDIR)/bootsubnodes $(BINDIR)/bootsubnodes
$(INSTALL) -m 755 $(SRCDIR)/bootvnodes $(BINDIR)/bootvnodes
$(INSTALL) -m 755 $(SRCDIR)/startcmddone $(BINDIR)/startcmddone
$(INSTALL) -m 755 $(SRCDIR)/getblob $(BINDIR)/getblob
(cd config; $(MAKE) DESTDIR=$(DESTDIR) subboss-script-install)
......
......@@ -44,13 +44,12 @@ SCRIPTS = $(addprefix $(SRCDIR)/, \
rc.tpmsetup rc.blobs rc.diskagent)
SUBBOSS_SCRIPTS = $(addprefix $(SRCDIR)/, \
rc.config rc.misc rc.route \
rc.tunnels rc.ifconfig rc.delays rc.hostnames \
rc.syncserver rc.linkagent rc.mkelab rc.localize \
rc.keys rc.trafgen rc.tarfiles rc.rpms rc.progagent \
rc.startcmd rc.simulator rc.firewall \
rc.tiptunnels rc.trace rc.motelog rc.fakejail \
rc.tpmsetup rc.mksubboss) # XXX: Add rc.blobs?
rc.config rc.misc rc.mounts rc.accounts rc.route \
rc.ifconfig rc.hostnames \
rc.syncserver rc.localize \
rc.keys rc.tarfiles rc.rpms rc.progagent \
rc.startcmd rc.firewall \
rc.tpmsetup rc.blobs rc.mksubboss)
include $(OBJDIR)/Makeconf
......
#
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -67,8 +67,9 @@ destdircheck:
false; \
fi
subboss-install: subboss-common-install etc-install init-install \
sup-install script-install bin-install jail-install
subboss-install: subboss-common-install subboss-etc-install init-install \
sup-install script-install subboss-bin-install jail-install
-rm -f $(BINDIR)/sethostname
@echo "Remember to install the PEM files if necessary"
install client-install: common-install etc-install init-install \
......@@ -194,6 +195,11 @@ bin-install: dir-install
$(INSTALL) -m 755 -s ../findif $(BINDIR)/findif
$(INSTALL) -m 755 -s ../dostype $(BINDIR)/dostype
subboss-bin-install: dir-install
$(INSTALL) -m 755 -s ../tmcc $(BINDIR)/tmcc.bin
$(INSTALL) -m 755 -s ../findif $(BINDIR)/findif
$(INSTALL) -m 755 -s ../dostype $(BINDIR)/dostype
etc-install: dir-install sysetc-install
$(INSTALL) -m 644 $(SRCDIR)/group $(ETCDIR)/group
$(INSTALL) -m 600 $(SRCDIR)/master.passwd $(ETCDIR)/master.passwd
......@@ -211,6 +217,14 @@ sysetc-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/testbed.sh $(RCDIR)/testbed.sh
$(INSTALL) -m 755 $(SRCDIR)/rc.early $(SYSETCDIR)/rc.early
subboss-etc-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/prepare.sh $(SYSETCDIR)/emulab/prepare.sh
$(INSTALL) -m 755 $(SRCDIR)/dhclient-exit-hooks \
$(SYSETCDIR)/dhclient-exit-hooks
$(INSTALL) -m 755 $(SRCDIR)/dhclient-enter-hooks \
$(SYSETCDIR)/dhclient-enter-hooks
$(INSTALL) -m 755 $(SRCDIR)/testbed.sh $(RCDIR)/testbed.sh
script-install: dir-install $(SCRIPTS)
$(INSTALL) -m 755 $(SRCDIR)/prepare $(BINDIR)/prepare
$(INSTALL) -m 755 $(SRCDIR)/reboot_prepare $(BINDIR)/reboot_prepare
......
#
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -64,7 +64,7 @@ destdircheck:
false; \
fi
subboss-install: basefbsd-subboss-install etc-install \
subboss-install: basefbsd-subboss-install \
sup-install script-install bin-install
install client-install: basefbsd-install etc-install \
......
......@@ -67,7 +67,7 @@ destdircheck:
install client-install: bincheck basefbsd-install etc-install \
sup-install script-install bin-install
subboss-install: bincheck basefbsd-subboss-install etc-install \
subboss-install: bincheck basefbsd-subboss-install subboss-etc-install \
sup-install script-install bin-install
simple-install: script-install bin-install
......@@ -120,6 +120,9 @@ etc-install: dir-install sysetc-install
$(INSTALL) -m 644 $(SRCDIR)/group $(ETCDIR)/group
$(INSTALL) -m 600 $(SRCDIR)/master.passwd $(ETCDIR)/master.passwd
subboss-etc-install: dir-install netif-emulab
$(INSTALL) -m 555 ./netif-emulab $(SYSETCDIR)/rc.d/netif-emulab
sysetc-install: dir-install netif-emulab
$(INSTALL) -m 444 $(SRCDIR)/rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 444 $(SRCDIR)/sysctl.conf $(SYSETCDIR)/sysctl.conf
......
......@@ -67,7 +67,7 @@ destdircheck:
install client-install: bincheck basefbsd-install etc-install \
sup-install script-install bin-install
subboss-install: bincheck basefbsd-subboss-install etc-install \
subboss-install: bincheck basefbsd-subboss-install subboss-etc-install \
sup-install script-install bin-install
simple-install: script-install bin-install
......@@ -129,6 +129,9 @@ etc-install: dir-install sysetc-install
$(INSTALL) -m 600 $(SRCDIR)/master.passwd $(ETCDIR)/master.passwd
$(INSTALL) -m 444 $(SRCDIR)/hosts $(ETCDIR)/hosts
subboss-etc-install: dir-install netif-emulab
$(INSTALL) -m 555 ./netif-emulab $(SYSETCDIR)/rc.d/netif-emulab
sysetc-install: dir-install netif-emulab tweak-syslog
$(INSTALL) -m 444 $(SRCDIR)/rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 444 $(SRCDIR)/sysctl.conf $(SYSETCDIR)/sysctl.conf
......
......@@ -68,6 +68,7 @@ endif
all: $(RC_SCRIPTS) $(OPS_SCRIPTS) $(SUBBOSS_SCRIPTS) capture.sh 3.v0_gateway.sh
control-build: $(OPS_SCRIPTS)
subboss-build: $(SUBBOSS_SCRIPTS)
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -94,7 +95,7 @@ install: $(addprefix $(INSTALL_RCDIR)/, $(RC_SCRIPTS))
control-install: $(addprefix $(INSTALL_RCDIR)/, $(OPS_SCRIPTS))
subboss-install: $(addprefix $(INSTALL_RCDIR)/, $(SUBBOSS_SCRIPTS))
subboss-install: subboss-build $(addprefix $(INSTALL_RCDIR)/, $(SUBBOSS_SCRIPTS))
clrhouse-install: $(INSTALL_RCDIR)/2.mysql-server.sh \
$(INSTALL_RCDIR)/1.mysql-client.sh
......
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