Commit 6e0bcee1 authored by Austin Clements's avatar Austin Clements
Browse files

Split off the certs from the rest of the dependencies and made the

install no longer depend on them.
parent 0c500b4d
...@@ -12,14 +12,15 @@ UNIFIED = @UNIFIED_BOSS_AND_OPS@ ...@@ -12,14 +12,15 @@ UNIFIED = @UNIFIED_BOSS_AND_OPS@
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
ETC_STUFF = cacert.pem cert.pem identity identity.pub key.pem \ ETC_STUFF = plabroot.tgz
plabroot.tgz pubkey.pem req.pem
CERTS = cacert.pem cert.pem key.pem pubkey.pem req.pem
# #
# Force dependencies on the scripts so that they will be rerun through # Force dependencies on the scripts so that they will be rerun through
# configure if the .in file is changed. # configure if the .in file is changed.
# #
all: $(ETC_STUFF) all: $(ETC_STUFF) # $(CERTS)
include $(TESTBED_SRCDIR)/GNUmakerules include $(TESTBED_SRCDIR)/GNUmakerules
...@@ -28,15 +29,14 @@ install: all data-install ...@@ -28,15 +29,14 @@ install: all data-install
# #
# Automate this part at some point. # Automate this part at some point.
# #
data-install: $(addprefix $(INSTALL_ETCDIR)/plab/, $(ETC_STUFF)) data-install: $(addprefix $(INSTALL_ETCDIR)/plab/, $(ETC_STUFF)) # \
# $(addprefix $(INSTALL_ETCDIR)/plab/, $(CERTS))
@echo Make sure etc/plab/ has the necessary certificates
@echo See tbsetup/plab/etc/README for instructions
post-install: post-install:
chmod 775 $(INSTALL_ETCDIR) chmod 775 $(INSTALL_ETCDIR)
chmod 775 $(INSTALL_ETCDIR)/plab chmod 775 $(INSTALL_ETCDIR)/plab
chown root $(INSTALL_ETCDIR)/plab/identity
chmod 600 $(INSTALL_ETCDIR)/plab/identity
chown root $(INSTALL_ETCDIR)/plab/identity.pub
chmod 600 $(INSTALL_ETCDIR)/plab/identity.pub
clean: clean:
......
Supports Markdown
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