[oe-commits] Dongxiao Xu : packageinfo.bbclass: A workaround for RPM architecture renaming
git at git.openembedded.org
git at git.openembedded.org
Wed Apr 18 14:58:48 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 00bd4589b21fe3a716ff2732ea55651c4abd77e4
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=00bd4589b21fe3a716ff2732ea55651c4abd77e4
Author: Dongxiao Xu <dongxiao.xu at intel.com>
Date: Wed Apr 18 20:48:16 2012 +0800
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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 46b9097..26cce60 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)
}
More information about the Openembedded-commits
mailing list