Commit ed96b2b9 authored by Ryan Jackson's avatar Ryan Jackson

Build support for subboss stuff

parent 2b07aaae
...@@ -200,6 +200,12 @@ endif ...@@ -200,6 +200,12 @@ endif
@$(MAKE) -C sensors client-install @$(MAKE) -C sensors client-install
@$(MAKE) -C tmcd client-install @$(MAKE) -C tmcd client-install
subboss: client
@$(MAKE) -C utils subboss
subboss-install: subboss client-install
@$(MAKE) -C utils subboss-install
TARBALLDESTDIR = /var/tmp/emulab-client TARBALLDESTDIR = /var/tmp/emulab-client
client-tarball: client-tarball:
......
...@@ -11,7 +11,7 @@ UNIFIED = @UNIFIED_BOSS_AND_OPS@ ...@@ -11,7 +11,7 @@ UNIFIED = @UNIFIED_BOSS_AND_OPS@
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
BIN_SCRIPTS = nalloc nfree nodeip readycount BIN_SCRIPTS = nalloc nfree nodeip readycount subboss_dhcpd_makeconf
SBIN_SCRIPTS = avail inuse showgraph if2port backup webcontrol node_status \ SBIN_SCRIPTS = avail inuse showgraph if2port backup webcontrol node_status \
genelists genelists.proxy dhcpd_makeconf nodelog unixgroups \ genelists genelists.proxy dhcpd_makeconf nodelog unixgroups \
dbcheck interswitch dbboot grabron stategraph newwanode \ dbcheck interswitch dbboot grabron stategraph newwanode \
...@@ -72,6 +72,7 @@ boss-install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \ ...@@ -72,6 +72,7 @@ boss-install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \
$(addprefix $(INSTALL_DIR)/opsdir/lib/, $(USERLIBS)) $(addprefix $(INSTALL_DIR)/opsdir/lib/, $(USERLIBS))
post-install: post-install:
chown root $(INSTALL_BINDIR)/subboss_dhcpd_makeconf
chown root $(INSTALL_SBINDIR)/genelists chown root $(INSTALL_SBINDIR)/genelists
chmod u+s $(INSTALL_SBINDIR)/genelists chmod u+s $(INSTALL_SBINDIR)/genelists
chown root $(INSTALL_SBINDIR)/dhcpd_makeconf chown root $(INSTALL_SBINDIR)/dhcpd_makeconf
......
...@@ -11,7 +11,7 @@ SUBDIR = dhcpd ...@@ -11,7 +11,7 @@ SUBDIR = dhcpd
ETCDIR = /usr/local/etc ETCDIR = /usr/local/etc
DHCPD_FILES = dhcpd.conf.template DHCPD_FILES = dhcpd.conf.template dhcpd.conf.subboss.template
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
...@@ -23,8 +23,9 @@ all: $(DHCPD_FILES) ...@@ -23,8 +23,9 @@ all: $(DHCPD_FILES)
include $(TESTBED_SRCDIR)/GNUmakerules include $(TESTBED_SRCDIR)/GNUmakerules
install: $(ETCDIR)/dhcpd.conf.template install: $(ETCDIR)/dhcpd.conf.template $(ETCDIR)/dhcpd.conf.subboss.template
-chmod 664 $(ETCDIR)/dhcpd.conf.template -chmod 664 $(ETCDIR)/dhcpd.conf.template
-chmod 664 $(ETCDIR)/dhcpd.conf.subboss.template
clean: clean:
rm -f $(DHCPD_FILES) rm -f $(DHCPD_FILES)
......
...@@ -19,6 +19,7 @@ include $(OBJDIR)/Makeconf ...@@ -19,6 +19,7 @@ include $(OBJDIR)/Makeconf
RC_SCRIPTS = 2.mysql-server.sh 3.testbed.sh \ RC_SCRIPTS = 2.mysql-server.sh 3.testbed.sh \
2.dhcpd.sh 1.mysql-client.sh 2.dhcpd.sh 1.mysql-client.sh
SUBBOSS_SCRIPTS = 2.dhcpd.sh
OPS_SCRIPTS = 3.and.sh 1.mysql-client.sh 1.mysql-server.sh OPS_SCRIPTS = 3.and.sh 1.mysql-client.sh 1.mysql-server.sh
ifeq ($(ELVINCOMPAT),1) ifeq ($(ELVINCOMPAT),1)
OPS_SCRIPTS += 2.elvind.sh 3.elvin_gateway.sh OPS_SCRIPTS += 2.elvind.sh 3.elvin_gateway.sh
...@@ -67,6 +68,8 @@ install: $(addprefix $(INSTALL_RCDIR)/, $(RC_SCRIPTS)) ...@@ -67,6 +68,8 @@ install: $(addprefix $(INSTALL_RCDIR)/, $(RC_SCRIPTS))
control-install: $(addprefix $(INSTALL_RCDIR)/, $(OPS_SCRIPTS)) control-install: $(addprefix $(INSTALL_RCDIR)/, $(OPS_SCRIPTS))
subboss-install: $(addprefix $(INSTALL_RCDIR)/, $(SUBBOSS_SCRIPTS))
clrhouse-install: $(INSTALL_RCDIR)/2.mysql-server.sh \ clrhouse-install: $(INSTALL_RCDIR)/2.mysql-server.sh \
$(INSTALL_RCDIR)/1.mysql-client.sh $(INSTALL_RCDIR)/1.mysql-client.sh
......
...@@ -49,6 +49,8 @@ SETUID_LIBX_SCRIPTS = xlogin ...@@ -49,6 +49,8 @@ SETUID_LIBX_SCRIPTS = xlogin
all: $(BIN_SCRIPTS) $(SBIN_SCRIPTS) $(LIBEXEC_SCRIPTS) $(CTRLSBIN_SCRIPTS) \ all: $(BIN_SCRIPTS) $(SBIN_SCRIPTS) $(LIBEXEC_SCRIPTS) $(CTRLSBIN_SCRIPTS) \
$(SUBDIRS) firstuser setbuildinfo $(SUBDIRS) firstuser setbuildinfo
subboss: daemon_wrapper
include $(TESTBED_SRCDIR)/GNUmakerules include $(TESTBED_SRCDIR)/GNUmakerules
install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \ install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \
...@@ -68,6 +70,8 @@ install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \ ...@@ -68,6 +70,8 @@ install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \
boss-install: install boss-install: install
subboss-install: $(INSTALL_SBINDIR)/daemon_wrapper
post-install: post-install:
chown root $(INSTALL_SBINDIR)/grabwebcams chown root $(INSTALL_SBINDIR)/grabwebcams
chmod u+s $(INSTALL_SBINDIR)/grabwebcams chmod u+s $(INSTALL_SBINDIR)/grabwebcams
......
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