diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-04-18 20:48:16 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-18 15:52:33 +0100 |
| commit | 00bd4589b21fe3a716ff2732ea55651c4abd77e4 (patch) | |
| tree | e1e7830d6234f7ef9fc22eb95de51b61b4d8a6a2 /meta/classes | |
| parent | 48ef8dbb0d1bdbc7e0e62665b5112282637f3266 (diff) | |
| download | openembedded-core-00bd4589b21fe3a716ff2732ea55651c4abd77e4.tar.gz openembedded-core-00bd4589b21fe3a716ff2732ea55651c4abd77e4.tar.bz2 openembedded-core-00bd4589b21fe3a716ff2732ea55651c4abd77e4.zip | |
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.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/packageinfo.bbclass | 13 |
1 files changed, 12 insertions, 1 deletions
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) } |