summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/lsb
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-10-17 17:24:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-17 14:10:45 +0100
commit13cfd5a7c9989e299c1df6e942a943548f694109 (patch)
tree830d28faa60706d7e46bf818aba9cafbe3fb42ac /meta/recipes-extended/lsb
parent601077f7bd42ffabe7d89233e1f6a8679e7baeca (diff)
downloadpoky-13cfd5a7c9989e299c1df6e942a943548f694109.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 (From OE-Core rev: f2dada2079b5f98e13d4888609368ba111967a60) 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.bb12
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"
2SECTION = "console/utils" 2SECTION = "console/utils"
3HOMEPAGE = "http://prdownloads.sourceforge.net/lsb" 3HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5PR = "r1" 5PR = "r2"
6 6
7LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" 7LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
8 8
@@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fd
19S = ${WORKDIR}/lsb-release-${PV} 19S = ${WORKDIR}/lsb-release-${PV}
20 20
21do_install(){ 21do_install(){
22 oe_runmake install prefix=${D} mandir=${D}/man/ DESTDIR=${D} 22 oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D}
23 mkdir -p ${D}/bin 23 mkdir -p ${D}/bin
24 mkdir -p ${D}/${baselib} 24 mkdir -p ${D}/${baselib}
25 mkdir -p ${D}/etc/lsb-release.d 25 mkdir -p ${D}/etc/lsb-release.d
@@ -69,7 +69,9 @@ do_install_append(){
69 install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/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 ${baselib} lib 72 if [ "${baselib}" != "lib64" ]; then
73 ln -sf ${baselib} lib64
74 fi
73 cd ${D}/${baselib} 75 cd ${D}/${baselib}
74 ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2 76 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 77 ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
@@ -82,7 +84,9 @@ do_install_append(){
82 84
83 if [ "${TARGET_ARCH}" == "powerpc64" ];then 85 if [ "${TARGET_ARCH}" == "powerpc64" ];then
84 cd ${D} 86 cd ${D}
85 ln -sf ${baselib} lib 87 if [ "${baselib}" != "lib64" ]; then
88 ln -sf ${baselib} lib64
89 fi
86 cd ${D}/${baselib} 90 cd ${D}/${baselib}
87 ln -sf ld64.so.1 ld-lsb-ppc64.so.2 91 ln -sf ld64.so.1 ld-lsb-ppc64.so.2
88 ln -sf ld64.so.1 ld-lsb-ppc64.so.3 92 ln -sf ld64.so.1 ld-lsb-ppc64.so.3