Merge remote-tracking branch 'nl6720/gpg-sender'

* nl6720/gpg-sender:
  .gitlab/ci/build_archiso.sh: use mkarchiso's -G option
  mkarchiso: support setting gpg sender
  mkarchiso: add some sane gpg options to override those set in user's gpg.conf

1 files changed, 3 insertions, 0 deletions

diff --git a/.gitlab/ci/build_archiso.sh b/.gitlab/ci/build_archiso.sh
index 8a6f92f..5250b51 100755
--- a/.gitlab/ci/build_archiso.sh
+++ b/.gitlab/ci/build_archiso.sh
@@ -199,6 +199,8 @@ EOF
         | awk -F':' '{if($1 ~ /sec/){ print $5 }}'
   )"
 
+  pgp_sender="Arch Linux Release Engineering (Ephemeral Signing Key) <arch-releng@lists.archlinux.org>"
+
   print_section_end "ephemeral_pgp_key"
 }
 
@@ -240,6 +242,7 @@ run_mkarchiso() {
       -D "${install_dir}" \
       -c "${codesigning_cert} ${codesigning_key}" \
       -g "${pgp_key_id}" \
+      -G "${pgp_sender}" \
       -o "${output}/" \
       -w "${tmpdir}/" \
       -m "${buildmode}" \