From e99c07192dc0845a4b64dd219cbb932478d48d8e Mon Sep 17 00:00:00 2001 From: Luke J Powlett Date: Thu, 11 Feb 2021 14:17:05 +0000 Subject: [PATCH] Added batch option on gpg key for RSYNC to support bionic --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index aacd87b..ed272ed 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,7 @@ downloads/$(MQ_ARCHIVE_DEV): ifneq "$(BUILD_RSYNC_SERVER)" "$(EMPTY)" # Use key which is not stored in the repository to fetch the files from the fileserver curl -L $(BUILD_RSYNC_ENCRYPTED_KEY_URL) -o ./host.key.gpg - @echo $(BUILD_RSYNC_ENCRYPTION_PASSWORD)|gpg --passphrase-fd 0 ./host.key.gpg + @echo $(BUILD_RSYNC_ENCRYPTION_PASSWORD)|gpg --batch --passphrase-fd 0 ./host.key.gpg chmod 600 ./host.key rsync -rv -e "ssh -o BatchMode=yes -q -o StrictHostKeyChecking=no -i ./host.key" --include="*/" --include="*.tar.gz" --exclude="*" $(BUILD_RSYNC_USER)@$(BUILD_RSYNC_SERVER):"$(BUILD_RSYNC_PATH)" downloads/$(MQ_ARCHIVE_DEV) -@rm host.key.gpg host.key @@ -225,7 +225,7 @@ ifneq "$(BUILD_RSYNC_SERVER)" "$(EMPTY)" # Use key which is not stored in the repository to fetch the files from the fileserver -@rm host.key.gpg host.key curl -L $(BUILD_RSYNC_ENCRYPTED_KEY_URL) -o ./host.key.gpg - @echo $(BUILD_RSYNC_ENCRYPTION_PASSWORD)|gpg --passphrase-fd 0 ./host.key.gpg + @echo $(BUILD_RSYNC_ENCRYPTION_PASSWORD)|gpg --batch --passphrase-fd 0 ./host.key.gpg chmod 600 ./host.key rsync -rv -e "ssh -o BatchMode=yes -q -o StrictHostKeyChecking=no -i ./host.key" --include="*/" --include="*.tar.gz" --exclude="*" $(BUILD_RSYNC_USER)@$(BUILD_RSYNC_SERVER):"$(BUILD_RSYNC_PATH)" downloads/$(MQ_ARCHIVE) -@rm host.key.gpg host.key