diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/sign_package_feed.bbclass | 9 | ||||
-rw-r--r-- | meta/classes/sign_rpm.bbclass | 11 |
2 files changed, 9 insertions, 11 deletions
diff --git a/meta/classes/sign_package_feed.bbclass b/meta/classes/sign_package_feed.bbclass index 63ca02fd9d..e1ec82e2ff 100644 --- a/meta/classes/sign_package_feed.bbclass +++ b/meta/classes/sign_package_feed.bbclass @@ -27,12 +27,7 @@ python () { for var in ('PACKAGE_FEED_GPG_NAME', 'PACKAGE_FEED_GPG_PASSPHRASE_FILE'): if not d.getVar(var, True): raise_sanity_error("You need to define %s in the config" % var, d) - - # Set expected location of the public key - d.setVar('PACKAGE_FEED_GPG_PUBKEY', - os.path.join(d.getVar('STAGING_ETCDIR_NATIVE', False), - 'PACKAGE-FEED-GPG-PUBKEY')) } -do_package_index[depends] += "signing-keys:do_export_public_keys" -do_rootfs[depends] += "signing-keys:do_export_public_keys" +do_package_index[depends] += "signing-keys:do_deploy" +do_rootfs[depends] += "signing-keys:do_populate_sysroot" diff --git a/meta/classes/sign_rpm.bbclass b/meta/classes/sign_rpm.bbclass index 8b59bacd45..c21e3f09af 100644 --- a/meta/classes/sign_rpm.bbclass +++ b/meta/classes/sign_rpm.bbclass @@ -28,8 +28,11 @@ python () { 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', False), - 'RPM-GPG-PUBKEY')) + d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_DIR_TARGET', False), + d.getVar('sysconfdir', False), + 'pki', + 'rpm-gpg', + 'RPM-GPG-KEY-${DISTRO_VERSION}')) } python sign_rpm () { @@ -44,5 +47,5 @@ python sign_rpm () { d.getVar('RPM_GPG_PASSPHRASE_FILE', True)) } -do_package_index[depends] += "signing-keys:do_export_public_keys" -do_rootfs[depends] += "signing-keys:do_export_public_keys" +do_package_index[depends] += "signing-keys:do_deploy" +do_rootfs[depends] += "signing-keys:do_populate_sysroot" |