diff options
Diffstat (limited to 'yocto-poky/meta/classes/sign_rpm.bbclass')
| -rw-r--r-- | yocto-poky/meta/classes/sign_rpm.bbclass | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/yocto-poky/meta/classes/sign_rpm.bbclass b/yocto-poky/meta/classes/sign_rpm.bbclass index 0aa4cd841..f0c3dc9be 100644 --- a/yocto-poky/meta/classes/sign_rpm.bbclass +++ b/yocto-poky/meta/classes/sign_rpm.bbclass @@ -4,23 +4,27 @@ # RPM_GPG_PASSPHRASE_FILE # Path to a file containing the passphrase of the signing key. # RPM_GPG_NAME -# Name of the key to sign with. Alternatively you can define -# %_gpg_name macro in your ~/.oerpmmacros file. -# RPM_GPG_PUBKEY -# Path to a file containing the public key (in "armor" format) -# corresponding the signing key. +# Name of the key to sign with. May be key id or key name. # GPG_BIN # Optional variable for specifying the gpg binary/wrapper to use for # signing. +# GPG_PATH +# Optional variable for specifying the gnupg "home" directory: # inherit sanity RPM_SIGN_PACKAGES='1' -_check_gpg_name () { - macrodef=`rpm -E '%_gpg_name'` - [ "$macrodef" == "%_gpg_name" ] && return 1 || return 0 +python () { + # Check configuration + for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE_FILE'): + if not d.getVar(var, True): + raise_sanity_error("You need to define %s in the config" % var, d) + + # Set the expected location of the public key + d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_ETCDIR_NATIVE'), + 'RPM-GPG-PUBKEY')) } @@ -29,18 +33,11 @@ def rpmsign_wrapper(d, files, passphrase, gpg_name=None): # Find the correct rpm binary rpm_bin_path = d.getVar('STAGING_BINDIR_NATIVE', True) + '/rpm' - cmd = rpm_bin_path + " --addsign " - if gpg_name: - cmd += "--define '%%_gpg_name %s' " % gpg_name - else: - try: - bb.build.exec_func('_check_gpg_name', d) - except bb.build.FuncFailed: - raise_sanity_error("You need to define RPM_GPG_NAME in bitbake " - "config or the %_gpg_name RPM macro defined " - "(e.g. in ~/.oerpmmacros", d) + cmd = rpm_bin_path + " --addsign --define '_gpg_name %s' " % gpg_name if d.getVar('GPG_BIN', True): cmd += "--define '%%__gpg %s' " % d.getVar('GPG_BIN', True) + if d.getVar('GPG_PATH', True): + cmd += "--define '_gpg_path %s' " % d.getVar('GPG_PATH', True) cmd += ' '.join(files) # Need to use pexpect for feeding the passphrase @@ -51,20 +48,19 @@ def rpmsign_wrapper(d, files, passphrase, gpg_name=None): proc.expect(pexpect.EOF, timeout=900) proc.close() except pexpect.TIMEOUT as err: - bb.debug('rpmsign timeout: %s' % err) + bb.warn('rpmsign timeout: %s' % err) proc.terminate() + else: + if os.WEXITSTATUS(proc.status) or not os.WIFEXITED(proc.status): + bb.warn('rpmsign failed: %s' % proc.before.strip()) return proc.exitstatus python sign_rpm () { import glob - rpm_gpg_pass_file = (d.getVar("RPM_GPG_PASSPHRASE_FILE", True) or "") - if rpm_gpg_pass_file: - with open(rpm_gpg_pass_file) as fobj: - rpm_gpg_passphrase = fobj.readlines()[0].rstrip('\n') - else: - raise_sanity_error("You need to define RPM_GPG_PASSPHRASE_FILE in the config", d) + with open(d.getVar("RPM_GPG_PASSPHRASE_FILE", True)) as fobj: + rpm_gpg_passphrase = fobj.readlines()[0].rstrip('\n') rpm_gpg_name = (d.getVar("RPM_GPG_NAME", True) or "") @@ -73,3 +69,5 @@ python sign_rpm () { if rpmsign_wrapper(d, rpms, rpm_gpg_passphrase, rpm_gpg_name) != 0: raise bb.build.FuncFailed("RPM signing failed") } + +do_package_index[depends] += "signing-keys:do_export_public_keys" |