Patchwork [1/1] lsb: Change link of ${baselib} to lib64 for 64bits system

login
register
mail settings
Submitter Xiaofeng Yan
Date Oct. 9, 2011, 7:11 a.m.
Message ID <8110c8b70b1778b7aa9b34a984c7073c800c1a96.1317030097.git.xiaofeng.yan@windriver.com>
Download mbox | patch
Permalink /patch/12961/
State New, archived
Headers show

Comments

Xiaofeng Yan - Oct. 9, 2011, 7:11 a.m.
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Binaries of lsb test suite need ld-linux.so* in /lib64.
for example:
Target$ ./lsbcmdchk
-sh: ./lsbcmdchk: No such file or directory
Target$ strings lsbcmdchk | grep "ld-"
/lib64/ld-lsb-x86-64.so.3

"lsbcmdchk" from lsb test suite is a binary program.
A new modification to lsb_1.4.bb caused that binaries from lsb test suite can't run
because binaries of lsb test suite need ld-linux.so* in /lib64.
But the link is changed due to adding multilib. I changed this link again.

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-extended/lsb/lsb_1.4.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Richard Purdie - Oct. 14, 2011, 11:56 a.m.
On Sun, 2011-10-09 at 15:11 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> Binaries of lsb test suite need ld-linux.so* in /lib64.
> for example:
> Target$ ./lsbcmdchk
> -sh: ./lsbcmdchk: No such file or directory
> Target$ strings lsbcmdchk | grep "ld-"
> /lib64/ld-lsb-x86-64.so.3
> 
> "lsbcmdchk" from lsb test suite is a binary program.
> A new modification to lsb_1.4.bb caused that binaries from lsb test suite can't run
> because binaries of lsb test suite need ld-linux.so* in /lib64.
> But the link is changed due to adding multilib. I changed this link again.
> 
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
>  meta/recipes-extended/lsb/lsb_1.4.bb |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
> index d472012..5df08b8 100644
> --- a/meta/recipes-extended/lsb/lsb_1.4.bb
> +++ b/meta/recipes-extended/lsb/lsb_1.4.bb
> @@ -2,7 +2,7 @@ DESCRIPTION = "LSB support for Poky Linux"
>  SECTION = "console/utils"
>  HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
>  LICENSE = "GPLv2+"
> -PR = "r1"
> +PR = "r2"
>  
>  LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
>  
> @@ -69,7 +69,7 @@ do_install_append(){
>         install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
>         if [ "${TARGET_ARCH}" == "x86_64" ];then
>  	       cd ${D}
> -	       ln -sf ${baselib} lib
> +	       ln -sf ${baselib} lib64
>  	       cd ${D}/${baselib}
>                 ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2
>                 ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
> @@ -82,7 +82,7 @@ do_install_append(){
>   
>         if [ "${TARGET_ARCH}" == "powerpc64" ];then
>    	       cd ${D}
> -	       ln -sf ${baselib} lib
> +	       ln -sf ${baselib} lib64
>                 cd ${D}/${baselib}
>                 ln -sf ld64.so.1 ld-lsb-ppc64.so.2
>                 ln -sf ld64.so.1 ld-lsb-ppc64.so.3

I'm afraid we need to add a bit more logic here. $baselib can be "lib",
"lib64" or anything else the user desires. I'd suggest we do something
like:

if [ "${baselib}" != "lib64" ]; then
	ln -sf ${baselib} lib64
fi

Cheers,

Richard

Patch

diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
index d472012..5df08b8 100644
--- a/meta/recipes-extended/lsb/lsb_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb_1.4.bb
@@ -2,7 +2,7 @@  DESCRIPTION = "LSB support for Poky Linux"
 SECTION = "console/utils"
 HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
 LICENSE = "GPLv2+"
-PR = "r1"
+PR = "r2"
 
 LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
 
@@ -69,7 +69,7 @@  do_install_append(){
        install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
        if [ "${TARGET_ARCH}" == "x86_64" ];then
 	       cd ${D}
-	       ln -sf ${baselib} lib
+	       ln -sf ${baselib} lib64
 	       cd ${D}/${baselib}
                ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2
                ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
@@ -82,7 +82,7 @@  do_install_append(){
  
        if [ "${TARGET_ARCH}" == "powerpc64" ];then
   	       cd ${D}
-	       ln -sf ${baselib} lib
+	       ln -sf ${baselib} lib64
                cd ${D}/${baselib}
                ln -sf ld64.so.1 ld-lsb-ppc64.so.2
                ln -sf ld64.so.1 ld-lsb-ppc64.so.3