Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2011-04-17 22:38:35 +1000
committerDan McGee <dan@archlinux.org>2011-04-20 18:58:55 -0500
commit4c31bc6e3f32d954a9a0f81555abe5b91db3a6d3 (patch)
tree89927ede6fc4ed41c6d0c58bf6450fc211c7372f /doc
parentcb35affd1b2ac7bb489c8774685225672c5a3d9f (diff)
Add configure option to specify package signing key
Add the "GPGKEY" option to makepkg.conf for specifying signing packages with the non-default key from the keyring. Is overridded by makepkg's --key option. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/makepkg.8.txt5
-rw-r--r--doc/makepkg.conf.5.txt4
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index f1b9f9c8..1a2dcd04 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -169,8 +169,9 @@ Options
Do not create a signature for the built package.
*\--key* <key>::
- Specify a key to use when signing the package. If not specified, the default
- key from the keyring will be used.
+ Specify a key to use when signing packages, overriding the GPGKEY setting
+ in linkman:makepkg.conf[5]. If not specified in either location, the
+ default key from the keyring will be used.
*\--noconfirm*::
(Passed to pacman) Prevent pacman from waiting for user input before
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index a9faa14d..9d3ad0a1 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -110,6 +110,10 @@ Options
running in the DistCC cluster. In addition, you will want to modify your
`MAKEFLAGS`.
+**GPGKEY=**""::
+ Specify a key to use for gpg signing instead of the default key in the
+ keyring. Can be overridden with makepkg's `--key` option.
+
**OPTIONS=(**strip !docs libtool emptydirs zipman**)**::
This array contains options that affect the default packaging. They are
equivalent to options that can be placed in the PKGBUILD; the defaults are