From d233c90823f7b443cad7ff6f5f3a74672e5edbf6 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Wed, 18 Apr 2012 20:48:16 +0800 Subject: packageinfo.bbclass: A workaround for RPM architecture renaming For beagleboard platform, the PACKAGE_ARCH for certain recipes is "armv7a-vfp-neon", however, the architecture label in RPM file name is "armv7a" due to a potential bug in RPM backend. This commit is a workaround to make Hob work in this case. (From OE-Core rev: 00bd4589b21fe3a716ff2732ea55651c4abd77e4) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- meta/classes/packageinfo.bbclass | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/packageinfo.bbclass b/meta/classes/packageinfo.bbclass index 46b9097a54..26cce604ae 100644 --- a/meta/classes/packageinfo.bbclass +++ b/meta/classes/packageinfo.bbclass @@ -20,14 +20,25 @@ python packageinfo_handler () { pkgrename = sdata['PKG_%s' % pkgname] pkgv = sdata['PKGV'].replace('-', '+') pkgr = sdata['PKGR'] + # We found there are some renaming issue with certain architecture. + # For example, armv7a-vfp-neon, it will use armv7a in the rpm file. This is the workaround for it. + arch_tmp = arch.split('-')[0] if os.path.exists(deploy_dir + '/' + arch + '/' + \ pkgname + '-' + pkgv + '-' + pkgr + '.' + arch + '.' + packaging) or \ + os.path.exists(deploy_dir + '/' + arch + '/' + \ + pkgname + '-' + pkgv + '-' + pkgr + '.' + arch_tmp + '.' + packaging) or \ os.path.exists(deploy_dir + '/' + arch + '/' + \ pkgrename + '-' + pkgv + '-' + pkgr + '.' + arch + '.' + packaging) or \ + os.path.exists(deploy_dir + '/' + arch + '/' + \ + pkgrename + '-' + pkgv + '-' + pkgr + '.' + arch_tmp + '.' + packaging) or \ os.path.exists(deploy_dir + '/' + arch + '/' + \ pkgname + '_' + pkgv + '-' + pkgr + '_' + arch + '.' + packaging) or \ os.path.exists(deploy_dir + '/' + arch + '/' + \ - pkgrename + '_' + pkgv + '-' + pkgr + '_' + arch + '.' + packaging): + pkgname + '_' + pkgv + '-' + pkgr + '_' + arch_tmp + '.' + packaging) or \ + os.path.exists(deploy_dir + '/' + arch + '/' + \ + pkgrename + '_' + pkgv + '-' + pkgr + '_' + arch + '.' + packaging) or \ + os.path.exists(deploy_dir + '/' + arch + '/' + \ + pkgrename + '_' + pkgv + '-' + pkgr + '_' + arch_tmp + '.' + packaging): pkginfolist.append(sdata) bb.event.fire(bb.event.PackageInfo(pkginfolist), e.data) } -- cgit v1.2.3-54-g00ecf