diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-03-30 23:21:19 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-03-30 23:21:19 +0300 |
commit | b4a027550acf2c1051c34f997b8e7e845017af4b (patch) | |
tree | 9e38d3c17b42cb1e6765620a87e908973a93c821 /yocto-poky/meta/recipes-core/os-release | |
parent | 2fe86d90044af218ced8f42fdded6b136f1046d2 (diff) | |
parent | f1e5d6968976c2341c6d554bfcc8895f1b33c26b (diff) | |
download | openbmc-b4a027550acf2c1051c34f997b8e7e845017af4b.tar.xz |
Merge commit 'f1e5d6968976c2341c6d554bfcc8895f1b33c26b' from yocto-2.0.1
Diffstat (limited to 'yocto-poky/meta/recipes-core/os-release')
-rw-r--r-- | yocto-poky/meta/recipes-core/os-release/os-release.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/yocto-poky/meta/recipes-core/os-release/os-release.bb b/yocto-poky/meta/recipes-core/os-release/os-release.bb index cc431d2cd..c690b82b2 100644 --- a/yocto-poky/meta/recipes-core/os-release/os-release.bb +++ b/yocto-poky/meta/recipes-core/os-release/os-release.bb @@ -32,11 +32,12 @@ 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}" +do_compile[depends] += "signing-keys:do_export_public_keys" do_install () { install -d ${D}${sysconfdir} |