diff options
| author |   Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-10-17 17:24:34 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-17 13:42:03 +0100 |
| commit | f2dada2079b5f98e13d4888609368ba111967a60 (patch) | |
| tree | e146932dfbc6a0d60cc4a4eca2f9f9edb27673b0 /meta/recipes-extended/lsb | |
| parent | 96a46957ea37f090c934c6ad446076111661a7c2 (diff) | |
| download | openembedded-core-f2dada2079b5f98e13d4888609368ba111967a60.tar.gz | |
lsb: Change link of ${baselib} to lib64 for 64bits system
Correct two faults:
1 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.
2 correct mandir
Waring will appear when running task task do_populate_sysroot
NOTE: package lsb-1.4-r2: task do_populate_sysroot: Succeeded
WARNING: For recipe lsb, the following files were installed but not shipped in any package:
WARNING: /{datadir}/man/man1/lsb_release.1.gz
I changed mandir=${D}/man to mandir=${D}/${datadir}/man
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/lsb')
| -rw-r--r-- | meta/recipes-extended/lsb/lsb_1.4.bb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb index d47201265e..7cecdf21bd 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" @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fd S = ${WORKDIR}/lsb-release-${PV} do_install(){ - oe_runmake install prefix=${D} mandir=${D}/man/ DESTDIR=${D} + oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D} mkdir -p ${D}/bin mkdir -p ${D}/${baselib} mkdir -p ${D}/etc/lsb-release.d @@ -69,7 +69,9 @@ do_install_append(){ install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb if [ "${TARGET_ARCH}" == "x86_64" ];then cd ${D} - ln -sf ${baselib} lib + if [ "${baselib}" != "lib64" ]; then + ln -sf ${baselib} lib64 + fi 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 +84,9 @@ do_install_append(){ if [ "${TARGET_ARCH}" == "powerpc64" ];then cd ${D} - ln -sf ${baselib} lib + if [ "${baselib}" != "lib64" ]; then + ln -sf ${baselib} lib64 + fi cd ${D}/${baselib} ln -sf ld64.so.1 ld-lsb-ppc64.so.2 ln -sf ld64.so.1 ld-lsb-ppc64.so.3 |