Commit 243184a5 authored by Leigh Stoller's avatar Leigh Stoller

Add rules to make sure that installs on the mothership have to be from the

mothership branch. Yes, this is going to annoy someone.
parent 0fca0ca5
# #
# Copyright (c) 2000-2015 University of Utah and the Flux Group. # Copyright (c) 2000-2016 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -85,7 +85,7 @@ endif ...@@ -85,7 +85,7 @@ endif
# #
# For installation on boss node # For installation on boss node
# #
boss-install: install-checks \ boss-install: install-checks install-branchcheck \
install-subdirs install-mkdirs \ install-subdirs install-mkdirs \
install-setbuildinfo install-setbuildinfo
@echo "Boss node installed!" @echo "Boss node installed!"
...@@ -95,19 +95,20 @@ boss-install-force: install-subdirs install-mkdirs install-setbuildinfo ...@@ -95,19 +95,20 @@ boss-install-force: install-subdirs install-mkdirs install-setbuildinfo
@echo "Boss node installed!" @echo "Boss node installed!"
# Skip only the schema checks, but do the other checks. # Skip only the schema checks, but do the other checks.
boss-install-noschemacheck: install-updatecheck \ boss-install-noschemacheck: install-updatecheck install-branchcheck \
install-sitevarscheck install-dbfillcheck \ install-sitevarscheck install-dbfillcheck \
install-genischemacheck install-subdirs install-mkdirs \ install-genischemacheck install-subdirs install-mkdirs \
install-setbuildinfo install-setbuildinfo
# Skip the update check. # Skip the update check.
boss-install-noupdatecheck: install-schemacheck \ boss-install-noupdatecheck: install-schemacheck install-branchcheck \
install-sitevarscheck install-dbfillcheck \ install-sitevarscheck install-dbfillcheck \
install-genischemacheck install-subdirs install-mkdirs \ install-genischemacheck install-subdirs install-mkdirs \
install-setbuildinfo install-setbuildinfo
# Only the checks: # Only the checks:
install-checks: install-updatecheck \ install-checks: install-branchcheck \
install-updatecheck \
install-schemacheck \ install-schemacheck \
install-sitevarscheck \ install-sitevarscheck \
install-dbfillcheck install-genischemacheck install-dbfillcheck install-genischemacheck
...@@ -430,6 +431,19 @@ ifeq ($(PGENISUPPORT),1) ...@@ -430,6 +431,19 @@ ifeq ($(PGENISUPPORT),1)
endif endif
@echo "Done" @echo "Done"
BRANCHCHECK=
BRANCHECHO= @echo "Skipping branch check since not the Mothership"
ifeq ($(ISMAINSITE),1)
ifeq ($(TBROOT),/usr/testbed)
BRANCHCHECK= cd $(SRCDIR) && \
git status --porcelain -s -b | head -1 | grep -q -s mothership
BRANCHECHO= @echo "Checking to make sure you are on the mothership branch"
endif
endif
install-branchcheck:
$(BRANCHECHO)
$(BRANCHCHECK)
# We use separate src and obj trees in Emulab, so the traditional distclean to # 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. # 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. # However, this may be useful if you mistakenly configure and make a src tree.
......
# #
# Copyright (c) 2000-2012 University of Utah and the Flux Group. # Copyright (c) 2000-2012, 2016 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -108,6 +108,21 @@ distclean: default-clean ...@@ -108,6 +108,21 @@ distclean: default-clean
default-clean: default-clean:
rm -f GNUmakefile rm -f GNUmakefile
# This is to avoid warnings about duplicate targets.
default-install:
ifeq ($(ISMAINSITE),1)
ifeq ($(TBROOT),/usr/testbed/devel/stoller)
(cd $(SRCDIR) ; \
git status --porcelain -s -b | head -1 | grep -q -s mothership)
else
/usr/bin/true
endif
else
/usr/bin/true
endif
install: default-install
# #
# Where to find source files. # Where to find source files.
# Using specific patterns instead of the catch-all VPATH variable # Using specific patterns instead of the catch-all VPATH variable
......
# #
# Copyright (c) 2000-2014 University of Utah and the Flux Group. # Copyright (c) 2000-2016 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -44,6 +44,7 @@ export JAR = @JAR@ ...@@ -44,6 +44,7 @@ export JAR = @JAR@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
ISMAINSITE = @TBMAINSITE@
TBROOT = @prefix@ TBROOT = @prefix@
TBDEFS = @TBDEFS@ TBDEFS = @TBDEFS@
TBDBNAME = @TBDBNAME@ TBDBNAME = @TBDBNAME@
......
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