From 2591c768e7d59b9f1b7a55ff615589893eb2a556 Mon Sep 17 00:00:00 2001 From: Lee Whalen Date: Sun, 1 Mar 2015 14:37:07 -0800 Subject: [PATCH] Fixing issues with Makefile per PR feedback --- Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8be8a43..ce681a2 100644 --- a/Makefile +++ b/Makefile @@ -61,32 +61,35 @@ lock-rpm: unlock-rpm: sudo yum versionlock clear -# Add other package types here. +# +# DEB builds +# + packages-deb: cd tools && PKGRELEASE="$${PKGRELEASE}" PKGDESCRIPTION="Safely store secrets in git/hg/svn repos using GPG encryption" ./mk_deb_fpmdir stack_blackbox mk_deb_fpmdir.stack_blackbox.txt -packages-rpm-debug: +packages-deb-debug: @echo BUILD: - @PKGRELEASE=99 make packages + @PKGRELEASE=99 make packages-deb @echo ITEMS TO BE PACKAGED: find ~/debbuild-$(PKGNAME)/installroot -type f @echo ITEMS ACTUALLY IN PACKAGE: - @rpm -qpl $$(cat ~/debbuild-$(PKGNAME)/bin-packages.txt) + @dpkg --contents $$(cat ~/debbuild-$(PKGNAME)/bin-packages.txt) local-deb: @PKGRELEASE=1 make packages -@sudo dpkg -e $(PKGNAME) sudo dpkg -i $$(cat ~/rpmbuild-$(PKGNAME)/bin-packages.txt) +# Add other package types here. # # System Test: # - confidence: @if [[ -e ~/.gnupg ]]; then echo ERROR: '~/.gnupg should not exist. If it does, bugs may polute your .gnupg configuration. If the code has no bugs everything will be fine. Do you feel lucky?'; false ; fi @if which >/dev/null gpg-agent ; then pkill gpg-agent ; rm -rf /tmp/tmp.* ; fi - @export PATH=~/gitwork/blackbox/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin ; + @export PATH=~/gitwork/blackbox/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin ; tools/confidence_test.sh cd ~/gitwork/blackbox && tools/confidence_test.sh @if which >/dev/null gpg-agent ; then pkill gpg-agent ; fi @if [[ -e ~/.gnupg ]]; then echo ERROR: '~/.gnupg was created which means the scripts might be poluting GnuPG configuration. Fix this bug.'; false ; fi