[PATCH 0/2]multilib: Change hard coded /usr/lib path

[PATCH 0/2]multilib: Change hard coded /usr/lib path

[Mei Lei]

This pull request fixes some hard coded /usr/lib path issues when building poky-lsb on qemux86-64, please review it.

Thanks,
Lei

The following changes since commit fa4bcfdb73167f8159b88e5a4d711c0d37627a70:
  Darren Hart (1):
        bb-matrix: correct BB and PM number canonicalization

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib lmei3/multilib-lsb
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/multilib-lsb

Mei Lei (2):
  lsbsetup_1.0.bb:  Change the hardcoded /usr/lib to support multilib
  perl-dynloader.patch: Fix libdir issue for multilib

 .../perl/perl-5.12.3/perl-dynloader.patch          |    2 +-
 meta/recipes-extended/lsb/lsbsetup_1.0.bb          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[PATCH 1/2] lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib

[Mei Lei]

Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 meta/recipes-extended/lsb/lsbsetup_1.0.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsbsetup_1.0.bb b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
index 4295805..03f8012 100644
--- a/meta/recipes-extended/lsb/lsbsetup_1.0.bb
+++ b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
@@ -14,7 +14,7 @@ do_install() {
     install -d ${D}/usr/bin
     install -d ${D}/${sysconfdir}
     install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin
-    install -d  ${D}/usr/lib/lsb
+    install -d  ${D}/${libdir}/lsb
     ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
     ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
     ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
-- 
1.6.3.3

Re: [PATCH 1/2] lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib

[Richard Purdie]

On Wed, 2011-07-20 at 16:48 +0800, Mei Lei wrote:
> Signed-off-by: Mei Lei <lei.mei@intel.com>
> ---
>  meta/recipes-extended/lsb/lsbsetup_1.0.bb |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-extended/lsb/lsbsetup_1.0.bb b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
> index 4295805..03f8012 100644
> --- a/meta/recipes-extended/lsb/lsbsetup_1.0.bb
> +++ b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
> @@ -14,7 +14,7 @@ do_install() {
>      install -d ${D}/usr/bin
>      install -d ${D}/${sysconfdir}
>      install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin
> -    install -d  ${D}/usr/lib/lsb
> +    install -d  ${D}/${libdir}/lsb
>      ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
>      ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
>      ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail

Merged to master, thanks.

Richard

[PATCH 2/2] perl-dynloader.patch: Fix libdir issue for multilib

[Mei Lei]

The perl-dynloader.patch can't support /usr/lib64, change the regular expression to support multilib.

Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 .../perl/perl-5.12.3/perl-dynloader.patch          |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
index d5ea00f..a45af91 100644
--- a/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
@@ -19,7 +19,7 @@ Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21
 +    {
 +        my $hostlib = $ENV{PERLHOSTLIB};
 +        print STDERR "*** Module name IN: $modlibname\n";
-+        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~ m/(^(.*lib\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
++        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~ m/(^(.*lib[0-9]*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
 +        print STDERR "*** p1: $p1  p3: $p3  p5: $p5\n";
 +        if ( $p1 ne "" ) {
 +            $modlibname = $hostlib.$p5;
-- 
1.6.3.3

Re: [PATCH 2/2] perl-dynloader.patch: Fix libdir issue for multilib

[Richard Purdie]

On Wed, 2011-07-20 at 16:48 +0800, Mei Lei wrote:
> The perl-dynloader.patch can't support /usr/lib64, change the regular expression to support multilib.
> 
> Signed-off-by: Mei Lei <lei.mei@intel.com>
> ---
>  .../perl/perl-5.12.3/perl-dynloader.patch          |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
> index d5ea00f..a45af91 100644
> --- a/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
> +++ b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
> @@ -19,7 +19,7 @@ Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21
>  +    {
>  +        my $hostlib = $ENV{PERLHOSTLIB};
>  +        print STDERR "*** Module name IN: $modlibname\n";
> -+        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~ m/(^(.*lib\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
> ++        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~ m/(^(.*lib[0-9]*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
>  +        print STDERR "*** p1: $p1  p3: $p3  p5: $p5\n";
>  +        if ( $p1 ne "" ) {
>  +            $modlibname = $hostlib.$p5;

We might need to relax this a little further since we might want things
like libx32 to work in future?

Cheers,

Richard

Re: [PATCH 2/2] perl-dynloader.patch: Fix libdir issue for multilib

[Mei, Lei]

>-----Original Message-----
>From: openembedded-core-bounces@lists.openembedded.org
>[mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
>Richard Purdie
>Sent: Wednesday, July 20, 2011 10:34 PM
>To: Patches and discussions about the oe-core layer
>Subject: Re: [OE-core] [PATCH 2/2] perl-dynloader.patch: Fix libdir issue for
>multilib
>
>On Wed, 2011-07-20 at 16:48 +0800, Mei Lei wrote:
>> The perl-dynloader.patch can't support /usr/lib64, change the regular
>expression to support multilib.
>>
>> Signed-off-by: Mei Lei <lei.mei@intel.com>
>> ---
>>  .../perl/perl-5.12.3/perl-dynloader.patch          |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
>b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
>> index d5ea00f..a45af91 100644
>> --- a/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
>> +++ b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
>> @@ -19,7 +19,7 @@ Update by Nitin A Kamble <nitin.a.kamble@intel.com>
>2011/04/21
>>  +    {
>>  +        my $hostlib = $ENV{PERLHOSTLIB};
>>  +        print STDERR "*** Module name IN: $modlibname\n";
>> -+        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~
>m/(^(.*lib\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
>> ++        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~
>m/(^(.*lib[0-9]*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
>>  +        print STDERR "*** p1: $p1  p3: $p3  p5: $p5\n";
>>  +        if ( $p1 ne "" ) {
>>  +            $modlibname = $hostlib.$p5;
>
>We might need to relax this a little further since we might want things
>like libx32 to work in future?

Hi Nitin,
	I am not sure what is the perl work style under libx32, can you supply some information about it?

Thanks
Lei


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

Re: [PATCH 2/2] perl-dynloader.patch: Fix libdir issue for multilib

[Kamble, Nitin A]

> -----Original Message-----
> From: Mei, Lei
> Sent: Thursday, July 21, 2011 12:54 AM
> To: Patches and discussions about the oe-core layer
> Cc: Kamble, Nitin A
> Subject: RE: [OE-core] [PATCH 2/2] perl-dynloader.patch: Fix libdir
> issue for multilib
> 
> 
> 
> >-----Original Message-----
> >From: openembedded-core-bounces@lists.openembedded.org
> >[mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> >Richard Purdie
> >Sent: Wednesday, July 20, 2011 10:34 PM
> >To: Patches and discussions about the oe-core layer
> >Subject: Re: [OE-core] [PATCH 2/2] perl-dynloader.patch: Fix libdir
> issue for
> >multilib
> >
> >On Wed, 2011-07-20 at 16:48 +0800, Mei Lei wrote:
> >> The perl-dynloader.patch can't support /usr/lib64, change the
> regular
> >expression to support multilib.
> >>
> >> Signed-off-by: Mei Lei <lei.mei@intel.com>
> >> ---
> >>  .../perl/perl-5.12.3/perl-dynloader.patch          |    2 +-
> >>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/meta/recipes-devtools/perl/perl-5.12.3/perl-
> dynloader.patch
> >b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
> >> index d5ea00f..a45af91 100644
> >> --- a/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
> >> +++ b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
> >> @@ -19,7 +19,7 @@ Update by Nitin A Kamble
> <nitin.a.kamble@intel.com>
> >2011/04/21
> >>  +    {
> >>  +        my $hostlib = $ENV{PERLHOSTLIB};
> >>  +        print STDERR "*** Module name IN: $modlibname\n";
> >> -+        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~
> >m/(^(.*lib\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
> >> ++        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~
> >m/(^(.*lib[0-9]*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
> >>  +        print STDERR "*** p1: $p1  p3: $p3  p5: $p5\n";
> >>  +        if ( $p1 ne "" ) {
> >>  +            $modlibname = $hostlib.$p5;
> >
> >We might need to relax this a little further since we might want
> things
> >like libx32 to work in future?
> 
> Hi Nitin,
> 	I am not sure what is the perl work style under libx32, can you
> supply some information about it?
> 
> Thanks
> Lei

Hi Lei,
  x32 would use libx32 as the lib dirname.
Thanks,
Nitin
> 
> 
> >
> >Cheers,
> >
> >Richard
> >
> >
> >
> >_______________________________________________
> >Openembedded-core mailing list
> >Openembedded-core@lists.openembedded.org
> >http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core