[PATCH 0/1][PULL] Hob: Workaround for RPM architecture renaming issue

[PATCH 0/1][PULL] Hob: Workaround for RPM architecture renaming issue

[Dongxiao Xu]

Hi Richard,

This pull request contains a workaround for RPM architecture renaming issue.

Please help to review and pull.

Thanks,
Dongxiao

The following changes since commit 48ef8dbb0d1bdbc7e0e62665b5112282637f3266:

  lsb: Fix PR bump, fix bashisms, correct dependency issue, tweak package description (2012-04-18 12:06:48 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dxu4/hob-bugfix-oecore
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-bugfix-oecore

Dongxiao Xu (1):
  packageinfo.bbclass: A workaround for RPM architecture renaming

 meta/classes/packageinfo.bbclass |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

-- 
1.7.4.1

[PATCH 1/1] packageinfo.bbclass: A workaround for RPM architecture renaming

[Dongxiao Xu]

For beagleboard platform, the PACKAGE_ARCH for certain recipes is
"armv7a-vfp-neon", however, the architecture label in RPM file name is
"arm" 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>
---
 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)
 }
-- 
1.7.4.1

Re: [PATCH 1/1] packageinfo.bbclass: A workaround for RPM architecture renaming

[Koen Kooi]

Op 18 apr. 2012, om 14:48 heeft Dongxiao Xu het volgende geschreven:

> For beagleboard platform, the PACKAGE_ARCH for certain recipes is
> "armv7a-vfp-neon", however, the architecture label in RPM file name is
> "arm" due to a potential bug in RPM backend.

'arm' or 'armv7a'? Your commit message doesn't match the comment in the code.

regards,

Koen

Re: [PATCH 1/1] packageinfo.bbclass: A workaround for RPM architecture renaming

[Richard Purdie]

On Wed, 2012-04-18 at 15:11 +0200, Koen Kooi wrote:
> Op 18 apr. 2012, om 14:48 heeft Dongxiao Xu het volgende geschreven:
> 
> > For beagleboard platform, the PACKAGE_ARCH for certain recipes is
> > "armv7a-vfp-neon", however, the architecture label in RPM file name is
> > "arm" due to a potential bug in RPM backend.
> 
> 'arm' or 'armv7a'? Your commit message doesn't match the comment in the code.

Since Dongxiao is probably about to go to sleep, he means "armv7a". I'd
wondered that when I looked at the commit message too.

Cheers,

Richard

Re: [PATCH 1/1] packageinfo.bbclass: A workaround for RPM architecture renaming

[Xu, Dongxiao]

On Wed, 2012-04-18 at 14:26 +0100, Richard Purdie wrote:
> On Wed, 2012-04-18 at 15:11 +0200, Koen Kooi wrote:
> > Op 18 apr. 2012, om 14:48 heeft Dongxiao Xu het volgende geschreven:
> > 
> > > For beagleboard platform, the PACKAGE_ARCH for certain recipes is
> > > "armv7a-vfp-neon", however, the architecture label in RPM file name is
> > > "arm" due to a potential bug in RPM backend.
> > 
> > 'arm' or 'armv7a'? Your commit message doesn't match the comment in the code.
> 
> Since Dongxiao is probably about to go to sleep, he means "armv7a". I'd
> wondered that when I looked at the commit message too.

Sorry for the typo, it is "armv7a". I've fixed it in my branch.

Thanks,
Dongxiao

> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 0/1][PULL] Hob: Workaround for RPM architecture renaming issue

[Saul Wold]

On 04/18/2012 05:48 AM, Dongxiao Xu wrote:
> Hi Richard,
>
> This pull request contains a workaround for RPM architecture renaming issue.
>
> Please help to review and pull.
>
> Thanks,
> Dongxiao
>
> The following changes since commit 48ef8dbb0d1bdbc7e0e62665b5112282637f3266:
>
>    lsb: Fix PR bump, fix bashisms, correct dependency issue, tweak package description (2012-04-18 12:06:48 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib dxu4/hob-bugfix-oecore
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-bugfix-oecore
>
> Dongxiao Xu (1):
>    packageinfo.bbclass: A workaround for RPM architecture renaming
>
>   meta/classes/packageinfo.bbclass |   13 ++++++++++++-
>   1 files changed, 12 insertions(+), 1 deletions(-)
>
Merged into OE-Core

Thanks
	Sau!