summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorMei Lei <lei.mei@intel.com>2011-08-08 11:22:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-08 13:59:33 +0100
commit3fad1d8c7ffd0783a7a33ca6cb5144f26396a5ab (patch)
tree775000359431922fbd2ecf48c916d6caccf13a34 /meta/recipes-extended
parente27ff5a9adae0e3ea843690b5f345d126c98fc10 (diff)
downloadpoky-3fad1d8c7ffd0783a7a33ca6cb5144f26396a5ab.tar.gz
lsb: Fix hard code libdir issue for multilib
(From OE-Core rev: 722aa1eb162b80f57290dd924fd7b41654af3a2b) Signed-off-by: Mei Lei <lei.mei@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/lsb/lsb_1.4.bb18
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 2b38232f0c..d47201265e 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}
21do_install(){ 21do_install(){
22 oe_runmake install prefix=${D} mandir=${D}/man/ DESTDIR=${D} 22 oe_runmake install prefix=${D} mandir=${D}/man/ DESTDIR=${D}
23 mkdir -p ${D}/bin 23 mkdir -p ${D}/bin
24 mkdir -p ${D}/lib 24 mkdir -p ${D}/${baselib}
25 mkdir -p ${D}/etc/lsb-release.d 25 mkdir -p ${D}/etc/lsb-release.d
26 echo -n "LSB_VERSION=\"core-4.1-noarch:" > ${D}/etc/lsb-release 26 echo -n "LSB_VERSION=\"core-4.1-noarch:" > ${D}/etc/lsb-release
27 27
@@ -61,34 +61,34 @@ do_install(){
61 61
62do_install_append(){ 62do_install_append(){
63 install -d ${D}/etc/core-lsb 63 install -d ${D}/etc/core-lsb
64 install -d ${D}/lib/lsb 64 install -d ${D}/${baselib}/lsb
65 for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon 65 for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon
66 do 66 do
67 install -m 0755 ${WORKDIR}/${i} ${D}/etc/core-lsb 67 install -m 0755 ${WORKDIR}/${i} ${D}/etc/core-lsb
68 done 68 done
69 install -m 0755 ${WORKDIR}/init-functions ${D}/lib/lsb 69 install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
70 if [ "${TARGET_ARCH}" == "x86_64" ];then 70 if [ "${TARGET_ARCH}" == "x86_64" ];then
71 cd ${D} 71 cd ${D}
72 ln -sf lib lib64 72 ln -sf ${baselib} lib
73 cd ${D}/lib 73 cd ${D}/${baselib}
74 ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2 74 ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2
75 ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3 75 ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
76 fi 76 fi
77 if [ "${TARGET_ARCH}" == "i586" ];then 77 if [ "${TARGET_ARCH}" == "i586" ];then
78 cd ${D}/lib 78 cd ${D}/${baselib}
79 ln -sf ld-linux.so.2 ld-lsb.so.2 79 ln -sf ld-linux.so.2 ld-lsb.so.2
80 ln -sf ld-linux.so.2 ld-lsb.so.3 80 ln -sf ld-linux.so.2 ld-lsb.so.3
81 fi 81 fi
82 82
83 if [ "${TARGET_ARCH}" == "powerpc64" ];then 83 if [ "${TARGET_ARCH}" == "powerpc64" ];then
84 cd ${D} 84 cd ${D}
85 ln -sf lib lib64 85 ln -sf ${baselib} lib
86 cd ${D}/lib 86 cd ${D}/${baselib}
87 ln -sf ld64.so.1 ld-lsb-ppc64.so.2 87 ln -sf ld64.so.1 ld-lsb-ppc64.so.2
88 ln -sf ld64.so.1 ld-lsb-ppc64.so.3 88 ln -sf ld64.so.1 ld-lsb-ppc64.so.3
89 fi 89 fi
90 if [ "${TARGET_ARCH}" == "powerpc" ];then 90 if [ "${TARGET_ARCH}" == "powerpc" ];then
91 cd ${D}/lib 91 cd ${D}/${baselib}
92 ln -sf ld.so.1 ld-lsb-ppc32.so.2 92 ln -sf ld.so.1 ld-lsb-ppc32.so.2
93 ln -sf ld.so.1 ld-lsb-ppc32.so.3 93 ln -sf ld.so.1 ld-lsb-ppc32.so.3
94 fi 94 fi