mirrors/meta-secure-core
1
0
Fork 0
mirror of https://github.com/jiazhang0/meta-secure-core.git synced 2026-07-16 04:36:58 +00:00
Code Issues Projects Releases Wiki Activity

meta-secure-core: use bb.fatal instead of bb.build.FuncFailed

Browse Source 
The bb.build.FuncFailed had been removed in bitbake with commit
cfeffb602dd5319f071cd6bcf84139ec77f2d170. Use bb.fatal instead of it.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
This commit is contained in:
Yi Zhao
2019-08-19 11:39:08 +08:00
committed by Jia Zhang
parent 8d1b7c2a29
commit 1be79730bf
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-integrity/classes/sign_rpm_ext.bbclass
+2 -4
View File
@@ -29,8 +29,7 @@ python check_rpm_public_key () {
(gpg_bin, gpg_path, d.getVar('RPM_GPG_PASSPHRASE', True), gpg_key)
status, output = oe.utils.getstatusoutput(cmd)
if status:
raise bb.build.FuncFailed('Failed to import gpg key (%s): %s' %
(gpg_key, output))
bb.fatal('Failed to import gpg key (%s): %s' % (gpg_key, output))
}
check_rpm_public_key[lockfiles] = "${TMPDIR}/check_rpm_public_key.lock"
do_package_write_rpm[prefuncs] += "check_rpm_public_key"
@@ -46,6 +45,5 @@ python () {
if not os.path.exists(gpg_path):
status, output = oe.utils.getstatusoutput('mkdir -m 0700 -p %s' % gpg_path)
if status:
raise bb.build.FuncFailed('Failed to create gpg keying %s: %s' %
(gpg_path, output))
bb.fatal('Failed to create gpg keying %s: %s' % (gpg_path, output))
}