diff options
| author | Mei Lei <lei.mei@intel.com> | 2011-08-08 11:22:51 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-08 13:44:43 +0100 |
| commit | 722aa1eb162b80f57290dd924fd7b41654af3a2b (patch) | |
| tree | aef4bac0e969486b2f5f4a43a9de2123203e41bc | |
| parent | 564d5fd5a289be0ca47d53608e43f9b78d5c6ee0 (diff) | |
| download | openembedded-core-722aa1eb162b80f57290dd924fd7b41654af3a2b.tar.gz openembedded-core-722aa1eb162b80f57290dd924fd7b41654af3a2b.tar.bz2 openembedded-core-722aa1eb162b80f57290dd924fd7b41654af3a2b.zip | |
lsb: Fix hard code libdir issue for multilib
Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | 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 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} 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 |