* [PATCH] ncurses: use ln -r to generate relative symlink
@ 2014-02-28 18:28 Ross Burton
2014-03-03 3:25 ` Lu Chong
0 siblings, 1 reply; 6+ messages in thread
From: Ross Burton @ 2014-02-28 18:28 UTC (permalink / raw)
To: openembedded-core
Instead of using a Python do_install() and calling
oe.path.make_relative_symlink, just pass -r to ln to generate a relative symlink
directly.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/ncurses/ncurses.inc | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index a94466a..835ecc3 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -147,12 +147,7 @@ _install_cfgs = "\
PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
"
-python do_install () {
- bb.build.exec_func("shell_do_install", d)
- oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so"))
-}
-
-shell_do_install() {
+do_install() {
# Order of installation is important; widec installs a 'curses.h'
# header with more definitions and must be installed last hence.
# Compatibility of these headers will be checked in 'do_test()'.
@@ -226,8 +221,7 @@ shell_do_install() {
mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
rm ${D}${libdir}/libtinfo.so
- # We'll turn this into a relative symlink after do_install returns
- ln -sf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
+ ln -rsf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
fi
oe_multilib_header curses.h
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] ncurses: use ln -r to generate relative symlink
2014-02-28 18:28 [PATCH] ncurses: use ln -r to generate relative symlink Ross Burton
@ 2014-03-03 3:25 ` Lu Chong
2014-03-03 3:29 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Lu Chong @ 2014-03-03 3:25 UTC (permalink / raw)
To: Ross Burton, openembedded-core
On 03/01/2014 02:28 AM, Ross Burton wrote:
> Instead of using a Python do_install() and calling
> oe.path.make_relative_symlink, just pass -r to ln to generate a relative symlink
> directly.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> meta/recipes-core/ncurses/ncurses.inc | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
> index a94466a..835ecc3 100644
> --- a/meta/recipes-core/ncurses/ncurses.inc
> +++ b/meta/recipes-core/ncurses/ncurses.inc
> @@ -147,12 +147,7 @@ _install_cfgs = "\
> PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
> "
>
> -python do_install () {
> - bb.build.exec_func("shell_do_install", d)
> - oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so"))
> -}
> -
> -shell_do_install() {
> +do_install() {
> # Order of installation is important; widec installs a 'curses.h'
> # header with more definitions and must be installed last hence.
> # Compatibility of these headers will be checked in 'do_test()'.
> @@ -226,8 +221,7 @@ shell_do_install() {
>
> mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
> rm ${D}${libdir}/libtinfo.so
> - # We'll turn this into a relative symlink after do_install returns
> - ln -sf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
> + ln -rsf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
Hi Ross,
In Ubuntu 12.04, `ln' command doesn't have '-r' option.
we will get following error during building ncurses
ln: invalid option -- 'r'
Best Regards
Chong
> fi
>
> oe_multilib_header curses.h
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ncurses: use ln -r to generate relative symlink
2014-03-03 3:25 ` Lu Chong
@ 2014-03-03 3:29 ` Khem Raj
2014-03-03 9:07 ` Fathi Boudra
2014-03-03 11:50 ` Burton, Ross
0 siblings, 2 replies; 6+ messages in thread
From: Khem Raj @ 2014-03-03 3:29 UTC (permalink / raw)
To: Lu Chong; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2134 bytes --]
On Mar 2, 2014, at 7:25 PM, Lu Chong <Chong.Lu@windriver.com> wrote:
>
> On 03/01/2014 02:28 AM, Ross Burton wrote:
>> Instead of using a Python do_install() and calling
>> oe.path.make_relative_symlink, just pass -r to ln to generate a relative symlink
>> directly.
>>
>> Signed-off-by: Ross Burton <ross.burton@intel.com>
>> ---
>> meta/recipes-core/ncurses/ncurses.inc | 10 ++--------
>> 1 file changed, 2 insertions(+), 8 deletions(-)
>>
>> diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
>> index a94466a..835ecc3 100644
>> --- a/meta/recipes-core/ncurses/ncurses.inc
>> +++ b/meta/recipes-core/ncurses/ncurses.inc
>> @@ -147,12 +147,7 @@ _install_cfgs = "\
>> PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
>> "
>> -python do_install () {
>> - bb.build.exec_func("shell_do_install", d)
>> - oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so"))
>> -}
>> -
>> -shell_do_install() {
>> +do_install() {
>> # Order of installation is important; widec installs a 'curses.h'
>> # header with more definitions and must be installed last hence.
>> # Compatibility of these headers will be checked in 'do_test()'.
>> @@ -226,8 +221,7 @@ shell_do_install() {
>> mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
>> rm ${D}${libdir}/libtinfo.so
>> - # We'll turn this into a relative symlink after do_install returns
>> - ln -sf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
>> + ln -rsf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
> Hi Ross,
>
> In Ubuntu 12.04, `ln' command doesn't have '-r' option.
> we will get following error during building ncurses
> ln: invalid option -- ‘r'
count debian in too.
>
> Best Regards
> Chong
>> fi
>> oe_multilib_header curses.h
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ncurses: use ln -r to generate relative symlink
2014-03-03 3:29 ` Khem Raj
@ 2014-03-03 9:07 ` Fathi Boudra
2014-03-03 11:50 ` Burton, Ross
1 sibling, 0 replies; 6+ messages in thread
From: Fathi Boudra @ 2014-03-03 9:07 UTC (permalink / raw)
To: Khem Raj, Burton, Ross; +Cc: openembedded-core
Same here, daily build failed.
Builders are using latest Ubuntu LTS shipped with coreutils 8.13 version.
--relative is introduced in coreutils 8.16:
http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=commit;h=15b8318e93a947d1422e9a927f699eda1085cf0d
On 3 March 2014 05:29, Khem Raj <raj.khem@gmail.com> wrote:
>
> On Mar 2, 2014, at 7:25 PM, Lu Chong <Chong.Lu@windriver.com> wrote:
>
>>
>> On 03/01/2014 02:28 AM, Ross Burton wrote:
>>> Instead of using a Python do_install() and calling
>>> oe.path.make_relative_symlink, just pass -r to ln to generate a relative symlink
>>> directly.
>>>
>>> Signed-off-by: Ross Burton <ross.burton@intel.com>
>>> ---
>>> meta/recipes-core/ncurses/ncurses.inc | 10 ++--------
>>> 1 file changed, 2 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
>>> index a94466a..835ecc3 100644
>>> --- a/meta/recipes-core/ncurses/ncurses.inc
>>> +++ b/meta/recipes-core/ncurses/ncurses.inc
>>> @@ -147,12 +147,7 @@ _install_cfgs = "\
>>> PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
>>> "
>>> -python do_install () {
>>> - bb.build.exec_func("shell_do_install", d)
>>> - oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so"))
>>> -}
>>> -
>>> -shell_do_install() {
>>> +do_install() {
>>> # Order of installation is important; widec installs a 'curses.h'
>>> # header with more definitions and must be installed last hence.
>>> # Compatibility of these headers will be checked in 'do_test()'.
>>> @@ -226,8 +221,7 @@ shell_do_install() {
>>> mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
>>> rm ${D}${libdir}/libtinfo.so
>>> - # We'll turn this into a relative symlink after do_install returns
>>> - ln -sf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
>>> + ln -rsf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
>> Hi Ross,
>>
>> In Ubuntu 12.04, `ln' command doesn't have '-r' option.
>> we will get following error during building ncurses
>> ln: invalid option -- 'r'
>
>
> count debian in too.
>
>>
>> Best Regards
>> Chong
>>> fi
>>> oe_multilib_header curses.h
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
Fathi Boudra
Builds and Baselines Manager | Release Manager
Linaro.org | Open source software for ARM SoCs
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ncurses: use ln -r to generate relative symlink
2014-03-03 3:29 ` Khem Raj
2014-03-03 9:07 ` Fathi Boudra
@ 2014-03-03 11:50 ` Burton, Ross
2014-03-04 23:48 ` Khem Raj
1 sibling, 1 reply; 6+ messages in thread
From: Burton, Ross @ 2014-03-03 11:50 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
On 3 March 2014 03:29, Khem Raj <raj.khem@gmail.com> wrote:
> count debian in too.
I wrote this patch on Debian stable...
But oh well.
Ross
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-03-04 23:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-28 18:28 [PATCH] ncurses: use ln -r to generate relative symlink Ross Burton
2014-03-03 3:25 ` Lu Chong
2014-03-03 3:29 ` Khem Raj
2014-03-03 9:07 ` Fathi Boudra
2014-03-03 11:50 ` Burton, Ross
2014-03-04 23:48 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.