mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

os-release: fix do_compile() when RPM signing is enabled

Browse Source 
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>
This commit is contained in:
Markus Lehtonen
2015-10-05 10:43:11 +03:00
committed by Richard Purdie
parent 9a02df0e93
commit 7766265c3c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/os-release/os-release.bb
+2 -2
View File
@@ -32,8 +32,8 @@ python do_compile () {
f.write('{0}={1}\n'.format(field, value)) f.write('{0}={1}\n'.format(field, value))
if d.getVar('RPM_SIGN_PACKAGES', True) == '1': if d.getVar('RPM_SIGN_PACKAGES', True) == '1':
rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True) rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True)
os.mkdir('${B}/rpm-gpg') bb.utils.mkdirhier('${B}/rpm-gpg')
distro_version = self.d.getVar('DISTRO_VERSION', True) or "oe.0" 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)) shutil.copy2(rpm_gpg_pubkey, d.expand('${B}/rpm-gpg/RPM-GPG-KEY-%s' % distro_version))
} }
do_compile[vardeps] += "${OS_RELEASE_FIELDS}" do_compile[vardeps] += "${OS_RELEASE_FIELDS}"