[PATCH 0/1]lsb: Fix hard code libdir issue for multilib

[PATCH 0/1]lsb: Fix hard code libdir issue for multilib

[Mei Lei]

This pull request fixes some hard coded libdir issues, please review it.

Thanks,
Lei

The following changes since commit 7a278238d9b08e0315e92d386282cb488cc0c7b4:
  Kumar Gala (1):
        bitbake.conf/powerpc64: Set baselib to 'lib64' for ppc64

are available in the git repository at:

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

Mei Lei (1):
  lsb: Fix hard code libdir issue for multilib

 meta/recipes-extended/lsb/lsb_1.4.bb |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

[PATCH 1/1] lsb: Fix hard code libdir issue for multilib

[Mei Lei]

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

diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
index 2b38232..d472012 100644
--- a/meta/recipes-extended/lsb/lsb_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb_1.4.bb
@@ -21,7 +21,7 @@ S = ${WORKDIR}/lsb-release-${PV}
 do_install(){
 	oe_runmake install prefix=${D}  mandir=${D}/man/ DESTDIR=${D} 
 	mkdir -p ${D}/bin
-	mkdir -p ${D}/lib
+	mkdir -p ${D}/${baselib}
 	mkdir -p ${D}/etc/lsb-release.d
 	echo -n "LSB_VERSION=\"core-4.1-noarch:" > ${D}/etc/lsb-release
 	
@@ -61,34 +61,34 @@ do_install(){
 
 do_install_append(){
        install -d ${D}/etc/core-lsb
-       install -d ${D}/lib/lsb
+       install -d ${D}/${baselib}/lsb
        for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon
        do
            install -m 0755 ${WORKDIR}/${i} ${D}/etc/core-lsb
        done
-       install -m 0755 ${WORKDIR}/init-functions ${D}/lib/lsb
+       install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
        if [ "${TARGET_ARCH}" == "x86_64" ];then
 	       cd ${D}
-	       ln -sf lib lib64
-	       cd ${D}/lib
+	       ln -sf ${baselib} lib
+	       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
        fi
        if [ "${TARGET_ARCH}" == "i586" ];then
-	       cd ${D}/lib
+	       cd ${D}/${baselib}
                ln -sf ld-linux.so.2 ld-lsb.so.2
                ln -sf ld-linux.so.2 ld-lsb.so.3
        fi
  
        if [ "${TARGET_ARCH}" == "powerpc64" ];then
   	       cd ${D}
-	       ln -sf lib lib64
-               cd ${D}/lib
+	       ln -sf ${baselib} lib
+               cd ${D}/${baselib}
                ln -sf ld64.so.1 ld-lsb-ppc64.so.2
                ln -sf ld64.so.1 ld-lsb-ppc64.so.3
        fi
        if [ "${TARGET_ARCH}" == "powerpc" ];then
-	       cd ${D}/lib
+	       cd ${D}/${baselib}
                ln -sf ld.so.1 ld-lsb-ppc32.so.2
                ln -sf ld.so.1 ld-lsb-ppc32.so.3
        fi	
-- 
1.7.0.4

Re: [PATCH 1/1] lsb: Fix hard code libdir issue for multilib

[Richard Purdie]

On Mon, 2011-08-08 at 11:22 +0800, Mei Lei wrote:
> Signed-off-by: Mei Lei <lei.mei@intel.com>
> ---
>  meta/recipes-extended/lsb/lsb_1.4.bb |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)

Merged to master, thanks.

Richard