* [OC-core][PATCH 0/1] lsb: Change link of ${baselib} to lib64 for 64bits system
@ 2011-10-17 9:24 Xiaofeng Yan
2011-10-17 9:24 ` [PATCH 1/1] " Xiaofeng Yan
0 siblings, 1 reply; 5+ messages in thread
From: Xiaofeng Yan @ 2011-10-17 9:24 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Hi Richard,
I modified my submitting according to your suggestion.
Change ln -sf ${baselib} lib64 to
if [ "${baselib}" != "lib64" ]; then
ln -sf ${baselib} lib64
fi
and correct a warning item caused by mandir.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/lsb64
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/lsb64
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
lsb: Change link of ${baselib} to lib64 for 64bits system
meta/recipes-extended/lsb/lsb_1.4.bb | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/1] lsb: Change link of ${baselib} to lib64 for 64bits system
2011-10-17 9:24 [OC-core][PATCH 0/1] lsb: Change link of ${baselib} to lib64 for 64bits system Xiaofeng Yan
@ 2011-10-17 9:24 ` Xiaofeng Yan
2011-10-17 12:43 ` Richard Purdie
0 siblings, 1 reply; 5+ messages in thread
From: Xiaofeng Yan @ 2011-10-17 9:24 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
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>
---
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 d472012..7cecdf2 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
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/1] lsb: Change link of ${baselib} to lib64 for 64bits system
2011-10-17 9:24 ` [PATCH 1/1] " Xiaofeng Yan
@ 2011-10-17 12:43 ` Richard Purdie
0 siblings, 0 replies; 5+ messages in thread
From: Richard Purdie @ 2011-10-17 12:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-10-17 at 17:24 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> 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>
> ---
> meta/recipes-extended/lsb/lsb_1.4.bb | 12 ++++++++----
> 1 files changed, 8 insertions(+), 4 deletions(-)
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 0/1] lsb: Change link of ${baselib} to lib64 for 64bits system
@ 2011-10-09 7:11 Xiaofeng Yan
2011-10-09 7:11 ` [PATCH 1/1] " Xiaofeng Yan
0 siblings, 1 reply; 5+ messages in thread
From: Xiaofeng Yan @ 2011-10-09 7:11 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
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
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/lsb64
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/lsb64
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
lsb: Change link of ${baselib} to lib64 for 64bits system
meta/recipes-extended/lsb/lsb_1.4.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/1] lsb: Change link of ${baselib} to lib64 for 64bits system
2011-10-09 7:11 [PATCH 0/1] " Xiaofeng Yan
@ 2011-10-09 7:11 ` Xiaofeng Yan
2011-10-14 11:56 ` Richard Purdie
0 siblings, 1 reply; 5+ messages in thread
From: Xiaofeng Yan @ 2011-10-09 7:11 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
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.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-extended/lsb/lsb_1.4.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
index d472012..5df08b8 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"
@@ -69,7 +69,7 @@ do_install_append(){
install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
if [ "${TARGET_ARCH}" == "x86_64" ];then
cd ${D}
- ln -sf ${baselib} lib
+ ln -sf ${baselib} lib64
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 +82,7 @@ do_install_append(){
if [ "${TARGET_ARCH}" == "powerpc64" ];then
cd ${D}
- ln -sf ${baselib} lib
+ ln -sf ${baselib} lib64
cd ${D}/${baselib}
ln -sf ld64.so.1 ld-lsb-ppc64.so.2
ln -sf ld64.so.1 ld-lsb-ppc64.so.3
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/1] lsb: Change link of ${baselib} to lib64 for 64bits system
2011-10-09 7:11 ` [PATCH 1/1] " Xiaofeng Yan
@ 2011-10-14 11:56 ` Richard Purdie
0 siblings, 0 replies; 5+ messages in thread
From: Richard Purdie @ 2011-10-14 11:56 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sun, 2011-10-09 at 15:11 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> 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.
>
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> meta/recipes-extended/lsb/lsb_1.4.bb | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
> index d472012..5df08b8 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"
>
> @@ -69,7 +69,7 @@ do_install_append(){
> install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
> if [ "${TARGET_ARCH}" == "x86_64" ];then
> cd ${D}
> - ln -sf ${baselib} lib
> + ln -sf ${baselib} lib64
> 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 +82,7 @@ do_install_append(){
>
> if [ "${TARGET_ARCH}" == "powerpc64" ];then
> cd ${D}
> - ln -sf ${baselib} lib
> + ln -sf ${baselib} lib64
> cd ${D}/${baselib}
> ln -sf ld64.so.1 ld-lsb-ppc64.so.2
> ln -sf ld64.so.1 ld-lsb-ppc64.so.3
I'm afraid we need to add a bit more logic here. $baselib can be "lib",
"lib64" or anything else the user desires. I'd suggest we do something
like:
if [ "${baselib}" != "lib64" ]; then
ln -sf ${baselib} lib64
fi
Cheers,
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-10-17 12:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-17 9:24 [OC-core][PATCH 0/1] lsb: Change link of ${baselib} to lib64 for 64bits system Xiaofeng Yan
2011-10-17 9:24 ` [PATCH 1/1] " Xiaofeng Yan
2011-10-17 12:43 ` Richard Purdie
-- strict thread matches above, loose matches on Subject: below --
2011-10-09 7:11 [PATCH 0/1] " Xiaofeng Yan
2011-10-09 7:11 ` [PATCH 1/1] " Xiaofeng Yan
2011-10-14 11:56 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox