summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-10-05 10:43:11 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-07 00:08:07 +0100
commit4038970f8ce27ac0d7a0afe2cdaa9a65108dfff5 (patch)
tree39d2433d2f04e9204dc6526a5ac0b8fb44b68925
parent02be728762c77962f9c3034cd7995ad51afaee95 (diff)
downloadopenembedded-core-contrib-4038970f8ce27ac0d7a0afe2cdaa9a65108dfff5.tar.gz
openembedded-core-contrib-4038970f8ce27ac0d7a0afe2cdaa9a65108dfff5.tar.bz2
openembedded-core-contrib-4038970f8ce27ac0d7a0afe2cdaa9a65108dfff5.zip
os-release: fix do_compile() when RPM signing is enabled
do_compile() task failed when RPM signing was in use. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/os-release/os-release.bb4
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 () {
f.write('{0}={1}\n'.format(field, value))
if d.getVar('RPM_SIGN_PACKAGES', True) == '1':
rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True)
- os.mkdir('${B}/rpm-gpg')
- distro_version = self.d.getVar('DISTRO_VERSION', True) or "oe.0"
+ bb.utils.mkdirhier('${B}/rpm-gpg')
+ distro_version = d.getVar('DISTRO_VERSION', True) or "oe.0"
shutil.copy2(rpm_gpg_pubkey, d.expand('${B}/rpm-gpg/RPM-GPG-KEY-%s' % distro_version))
}
do_compile[vardeps] += "${OS_RELEASE_FIELDS}"