diff --git a/README.md b/README.md index fa74ed7..b2b4f1a 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ above! - [Git](https://git-scm.com/) - [VirtualBox](https://www.virtualbox.org/) - [Vagrant](https://www.vagrantup.com/) 2.0.3 or higher -- [GnuPG](https://www.gnupg.org/) 2.x (2.11.18 or greater) and make sure it is callable via `gpg2` +- [GnuPG](https://www.gnupg.org/) 2.x (2.11.18 or greater) - [Python](https://www.python.org/) 3.x (with `venv` support in case that is packaged separately) - [direnv](https://direnv.net/) (Optional/Recommended) @@ -390,7 +390,7 @@ You can generate a keypair specifically for zcash gitian builds with a command l ``` -zcash-gitian$ gpg2 --quick-generate-key --batch --passphrase '' "Harry Potter (zcash gitian) " +zcash-gitian$ gpg --quick-generate-key --batch --passphrase '' "Harry Potter (zcash gitian) " gpg: key 3F0C2117D53A4A49 marked as ultimately trusted gpg: directory '/home/hpotter/.gnupg/openpgp-revocs.d' created gpg: revocation certificate stored as '/home/hpotter/.gnupg/openpgp-revocs.d/3F14A629C06FA31D59C64FE93F0C2117D53A4A49.rev' @@ -413,7 +413,7 @@ Some explanation of the arguments used in the above example: You can check that the key was generated and added to your local gpg key database, and see its fingerprint value, like this: ``` -zcash-gitian$ gpg2 --list-keys +zcash-gitian$ gpg --list-keys /home/hpotter/.gnupg/pubring.kbx ---------------------------------- pub rsa2048 2018-04-23 [SC] [expires: 2020-04-22] diff --git a/dependency_install_steps_by_platform/Debian_9.x.md b/dependency_install_steps_by_platform/Debian_9.x.md index 4f14df2..1d44c13 100644 --- a/dependency_install_steps_by_platform/Debian_9.x.md +++ b/dependency_install_steps_by_platform/Debian_9.x.md @@ -126,36 +126,6 @@ Vagrant 2.2.4 -# Install GnuPG 2.x (2.1.18 or greater) - -This is likely already installed and runnable via 'gpg' - -``` -$ gpg --version -gpg (GnuPG) 2.1.18 - -``` - -We want to be able to run it using the command 'gpg2'. For that we can install the gnupg2 package. - -According to the description of that package, “This is a dummy transitional package that provides -symlinks from gpg2 to gpg.” -https://packages.debian.org/stretch/gnupg2 - -``` -$ sudo apt install gnupg2 -``` - -Most recently tested 2019-03-21 with the following GnuPG release: - -``` -$ gpg2 --version -gpg (GnuPG) 2.1.18 -... -``` - - - # Install venv support `venv` is a python module used to create isolated project-specific environments, so that projects on diff --git a/dependency_install_steps_by_platform/Ubuntu_18.04.x.md b/dependency_install_steps_by_platform/Ubuntu_18.04.x.md index 05cdd83..4f0b009 100644 --- a/dependency_install_steps_by_platform/Ubuntu_18.04.x.md +++ b/dependency_install_steps_by_platform/Ubuntu_18.04.x.md @@ -11,10 +11,10 @@ Description: Ubuntu 18.04.2 LTS -## Install Git, VirtualBox, GnuPG, and rng-tools +## Install Git, VirtualBox, and rng-tools ``` -$ sudo apt install git virtualbox gnupg2 rng-tools +$ sudo apt install git virtualbox rng-tools ``` @@ -91,15 +91,6 @@ Oracle VM VirtualBox Manager 5.2.10_Ubuntu ``` -### GnuPG - -``` -$ gpg2 --version -gpg (GnuPG) 2.2.4 -... -``` - - ### Vagrant ``` diff --git a/dependency_install_steps_by_platform/macOS.md b/dependency_install_steps_by_platform/macOS.md index c185dab..b773b19 100644 --- a/dependency_install_steps_by_platform/macOS.md +++ b/dependency_install_steps_by_platform/macOS.md @@ -114,32 +114,6 @@ libgcrypt 1.8.4 -## Make sure 'gpg2' can be called - -As of this writing, we have ansible tasks that make calls to 'gpg2' while the gnupg homebrew formula -installs the executable 'gpg'. - -``` -$ type gpg -gpg is /usr/local/bin/gpg -$ type gpg2 --bash: type: gpg2: not found -``` - -If this is still the case, a simple workaround option is to create a symlink from gpg2 to gpg: - -``` -$ ln -s /usr/local/bin/gpg /usr/local/bin/gpg2 -$ gpg2 --version -gpg (GnuPG) 2.2.14 -[...] -$ -``` - -If you find that this issue has been resolved, please remove this step :) - - - ## Install Python 3.x Python 2.x is installed by default in macOS, but we want to be more current. Installing the 'python' diff --git a/roles/gitian/tasks/gpg.yml b/roles/gitian/tasks/gpg.yml index d1931a0..6ceef88 100644 --- a/roles/gitian/tasks/gpg.yml +++ b/roles/gitian/tasks/gpg.yml @@ -1,12 +1,12 @@ --- - name: Check that the secret key exists. - local_action: "shell gpg2 --list-secret-keys --with-colons | grep {{ gpg_key_id }}" + local_action: "shell gpg --list-secret-keys --with-colons | grep {{ gpg_key_id }}" become: no ignore_errors: true register: gpg_list_keys_result - name: Export the GPG private key from the local keyring. - local_action: "command gpg2 --armor --export-secret-key {{ gpg_key_id }}" + local_action: "command gpg --armor --export-secret-key {{ gpg_key_id }}" become: no register: gpg_private_key changed_when: false @@ -40,7 +40,7 @@ group: "{{ gitian_user }}" - name: Import the GPG private key to the Vagrant user. - command: "gpg2 --import /tmp/{{ gpg_key_id }}.sec" + command: "gpg --import /tmp/{{ gpg_key_id }}.sec" become_user: "{{ gitian_user }}" when: gpg_list_keys_result.stdout != '' and gpg_private_key.stdout is defined no_log: True diff --git a/roles/gitian/templates/gitian-build.sh b/roles/gitian/templates/gitian-build.sh index 99ed244..464ab56 100644 --- a/roles/gitian/templates/gitian-build.sh +++ b/roles/gitian/templates/gitian-build.sh @@ -19,7 +19,7 @@ proc=2 mem=3584 lxc=true scriptName=$(basename -- "$0") -signProg="gpg2 --detach-sign" +signProg="gpg --detach-sign" commitFiles=true # Help Message diff --git a/roles/gitian/templates/profile b/roles/gitian/templates/profile index bfae8bf..1476db1 100644 --- a/roles/gitian/templates/profile +++ b/roles/gitian/templates/profile @@ -21,7 +21,6 @@ if [ -d "$HOME/bin" ] ; then PATH="$HOME/bin:$PATH" fi -alias gpg='gpg2' export DISTRO=debian export SUITE=jessie export ARCH=amd64