File tree Expand file tree Collapse file tree 1 file changed +13
-0
lines changed
Expand file tree Collapse file tree 1 file changed +13
-0
lines changed Original file line number Diff line number Diff line change @@ -24,10 +24,23 @@ all: assert-dom0
2424
2525dev staging : assert-dom0 # # Configures and builds a dev or staging environment
2626 ./scripts/configure-environment.py --env $@
27+ $(MAKE ) assert-keyring-%
2728 $(MAKE ) validate
2829 $(MAKE ) prep-dev
2930 sdw-admin --apply
3031
32+ .PHONY : assert-keyring-%
33+ assert-keyring-% : # # Correct keyring pkg installed
34+ @rpm -q securedrop-workstation-keyring-$* > /dev/null 2>&1 || { \
35+ echo " Error: Install securedrop-workstation-keyring-$* " >&2 ; exit 1; \
36+ }
37+ @if [ " $* " = " staging" ]; then \
38+ if rpm -q securedrop-workstation-keyring-dev > /dev/null 2>&1 ; then \
39+ echo " Error: Uninstall securedrop-workstation-keyring-dev" >&2 ; \
40+ exit 1; \
41+ fi \
42+ fi
43+
3144.PHONY : build-rpm
3245build-rpm : OUT:=build-log/securedrop-workstation-$(shell date +% Y% m% d) .log
3346build-rpm : # # Build RPM package
You can’t perform that action at this time.
0 commit comments