diff options
author | Randy Witt <randy.e.witt@linux.intel.com> | 2016-02-19 08:45:25 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-26 17:16:25 +0000 |
commit | 7bb9e8ddbfabfbaebe1b3cb635b6d9979854cc47 (patch) | |
tree | 2255b9e26f87d9aab9c92fe9f76d44f2ef421e8f /meta/recipes-core/os-release | |
parent | 64ab17b707dc431aaed880d6d8615971243f46f8 (diff) | |
download | poky-7bb9e8ddbfabfbaebe1b3cb635b6d9979854cc47.tar.gz |
signing-keys: Make signing keys the only publisher of keys
Previously the keys were put into the os-release package. The package
indexing code was also deploying the keys rather than only using the keys.
This change makes signing-keys.bb the only publisher of the keys and also
uses standard tasks that already have sstate.
(From OE-Core rev: 1e38068ac38dfd067655dfd41464e28439179306)
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/os-release')
-rw-r--r-- | meta/recipes-core/os-release/os-release.bb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index df19ca216f..58364ea249 100644 --- a/meta/recipes-core/os-release/os-release.bb +++ b/meta/recipes-core/os-release/os-release.bb | |||
@@ -30,21 +30,10 @@ python do_compile () { | |||
30 | value = d.getVar(field, True) | 30 | value = d.getVar(field, True) |
31 | if value: | 31 | if value: |
32 | f.write('{0}="{1}"\n'.format(field, value)) | 32 | f.write('{0}="{1}"\n'.format(field, value)) |
33 | if d.getVar('RPM_SIGN_PACKAGES', True) == '1': | ||
34 | rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True) | ||
35 | bb.utils.mkdirhier('${B}/rpm-gpg') | ||
36 | distro_version = d.getVar('DISTRO_VERSION', True) or "oe.0" | ||
37 | shutil.copy2(rpm_gpg_pubkey, d.expand('${B}/rpm-gpg/RPM-GPG-KEY-%s' % distro_version)) | ||
38 | } | 33 | } |
39 | do_compile[vardeps] += "${OS_RELEASE_FIELDS}" | 34 | do_compile[vardeps] += "${OS_RELEASE_FIELDS}" |
40 | do_compile[depends] += "signing-keys:do_export_public_keys" | ||
41 | 35 | ||
42 | do_install () { | 36 | do_install () { |
43 | install -d ${D}${sysconfdir} | 37 | install -d ${D}${sysconfdir} |
44 | install -m 0644 os-release ${D}${sysconfdir}/ | 38 | install -m 0644 os-release ${D}${sysconfdir}/ |
45 | |||
46 | if [ -d "rpm-gpg" ]; then | ||
47 | install -d "${D}${sysconfdir}/pki" | ||
48 | cp -r "rpm-gpg" "${D}${sysconfdir}/pki/" | ||
49 | fi | ||
50 | } | 39 | } |