diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2015-10-05 10:43:11 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-07 00:11:21 +0100 |
commit | 7766265c3c643a92ccdb24e5e398facacea7fe74 (patch) | |
tree | f2eaf98fb7bf7421afb5d9588becdac9ddfc8cc3 /meta/recipes-core | |
parent | 9a02df0e932106bcb3dda0a7a2eb1113719fb4ee (diff) | |
download | poky-7766265c3c643a92ccdb24e5e398facacea7fe74.tar.gz |
os-release: fix do_compile() when RPM signing is enabled
do_compile() task failed when RPM signing was in use.
(From OE-Core rev: 4038970f8ce27ac0d7a0afe2cdaa9a65108dfff5)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/os-release/os-release.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index cc431d2cdc..db827602f3 100644 --- a/meta/recipes-core/os-release/os-release.bb +++ b/meta/recipes-core/os-release/os-release.bb | |||
@@ -32,8 +32,8 @@ python do_compile () { | |||
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': | 33 | if d.getVar('RPM_SIGN_PACKAGES', True) == '1': |
34 | rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True) | 34 | rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True) |
35 | os.mkdir('${B}/rpm-gpg') | 35 | bb.utils.mkdirhier('${B}/rpm-gpg') |
36 | distro_version = self.d.getVar('DISTRO_VERSION', True) or "oe.0" | 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)) | 37 | shutil.copy2(rpm_gpg_pubkey, d.expand('${B}/rpm-gpg/RPM-GPG-KEY-%s' % distro_version)) |
38 | } | 38 | } |
39 | do_compile[vardeps] += "${OS_RELEASE_FIELDS}" | 39 | do_compile[vardeps] += "${OS_RELEASE_FIELDS}" |