All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 662b7943 authored by Gary Wong's avatar Gary Wong

Omit the protogeni schemacheck on a boss-install-force.

parent f852557b
......@@ -51,7 +51,8 @@ install:
# For installation on boss node
#
boss-install: install-schemacheck install-sitevarscheck install-dbfillcheck \
install-subdirs install-mkdirs install-setbuildinfo
install-genischemacheck install-subdirs install-mkdirs \
install-setbuildinfo
@echo "Boss node installed!"
#
......@@ -306,6 +307,9 @@ install-setbuildinfo:
@echo "Setting the Build and Version info"
$(SETBUILDINFO)
install-genischemacheck:
@$(MAKE) -C protogeni install-genischemacheck
# We use separate src and obj trees in Emulab, so the traditional distclean to
# clean "made" files from a mingled source-and-obj tree is unnecessary.
# However, this may be useful if you mistakenly configure and make a src tree.
......
......@@ -11,7 +11,7 @@ SUBDIR = protogeni
include $(OBJDIR)/Makeconf
SUBDIRS = security xmlrpc lib scripts etc
SUBDIRS = security xmlrpc lib scripts etc
all: all-subdirs
......@@ -24,6 +24,9 @@ install:
@$(MAKE) -C scripts install
@$(MAKE) -C etc install
install-genischemacheck:
@$(MAKE) -C lib install-genischemacheck
control-install:
# Clearinghouse install.
......
......@@ -32,7 +32,7 @@ all: $(LIB_SCRIPTS) $(SBIN_SCRIPTS) $(SCRIPTS)
include $(TESTBED_SRCDIR)/GNUmakerules
install: install-schemacheck $(addprefix $(INSTALL_LIBDIR)/, $(LIB_SCRIPTS)) \
install: $(addprefix $(INSTALL_LIBDIR)/, $(LIB_SCRIPTS)) \
$(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS)) \
$(addprefix $(INSTALL_DIR)/opsdir/lib/, $(OPS_LIBS))
......@@ -45,7 +45,7 @@ SCHEMACHECK= cd $(OBJDIR)/protogeni/lib && perl genischemacheck.pl
else
SCHEMACHECK= @echo "Skipping schema check, since prefix isn't /usr/testbed"
endif
install-schemacheck: genischemacheck.pl
install-genischemacheck: genischemacheck.pl
@echo "Checking DB schema..."
$(SCHEMACHECK)
......
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