* [PATCH 1/1] coreutils: fix for native and nativesdk
2015-10-10 7:04 Robert Yang
@ 2015-10-10 7:04 ` Robert Yang
0 siblings, 0 replies; 7+ messages in thread
From: Robert Yang @ 2015-10-10 7:04 UTC (permalink / raw)
To: openembedded-core
The do_install_append is used for moving/renaming for ALTERNATIVE, but
it breaks native and nativesdk, for example there is no ln, but
ln.coreutils, that makes coreutils-native or nativesdk-coreutils doesn't
work. This patch fixes the problem.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-core/coreutils/coreutils_8.24.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/coreutils/coreutils_8.24.bb b/meta/recipes-core/coreutils/coreutils_8.24.bb
index 034ebcd..f042346 100644
--- a/meta/recipes-core/coreutils/coreutils_8.24.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.24.bb
@@ -62,7 +62,7 @@ do_compile_prepend () {
mkdir -p ${B}/src
}
-do_install_append() {
+do_install_append_class-target() {
for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done
install -d ${D}${base_bindir}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 0/1] coreutils: fix for native and nativesdk
@ 2016-04-26 6:04 Robert Yang
2016-04-26 6:04 ` [PATCH 1/1] " Robert Yang
2016-05-16 1:39 ` [PATCH 0/1] " Robert Yang
0 siblings, 2 replies; 7+ messages in thread
From: Robert Yang @ 2016-04-26 6:04 UTC (permalink / raw)
To: openembedded-core
The following changes since commit e2dbe5eb869b8336b91023b83d7ca866197efa73:
license.bbclass: make sure that image manifest dir exists (2016-04-22 16:28:47 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/core
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/core
Dengke Du (1):
coreutils: fix for native and nativesdk
meta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/1] coreutils: fix for native and nativesdk
2016-04-26 6:04 [PATCH 0/1] coreutils: fix for native and nativesdk Robert Yang
@ 2016-04-26 6:04 ` Robert Yang
2016-04-26 14:34 ` Denys Dmytriyenko
2016-05-16 1:39 ` [PATCH 0/1] " Robert Yang
1 sibling, 1 reply; 7+ messages in thread
From: Robert Yang @ 2016-04-26 6:04 UTC (permalink / raw)
To: openembedded-core
From: Dengke Du <dengke.du@windriver.com>
The do_install_append is used for moving/renaming for ALTERNATIVE, but
it breaks native, for example there is no ln, but ln.coreutils, that
makes coreutils-native don't work. This patch fixes the problem.
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/coreutils/coreutils_8.25.bb b/meta/recipes-core/coreutils/coreutils_8.25.bb
index 419a693..77b3862 100644
--- a/meta/recipes-core/coreutils/coreutils_8.25.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.25.bb
@@ -70,6 +70,11 @@ do_compile_prepend () {
}
do_install_append() {
+ if [ "${CLASSOVERRIDE}" = "class-native" ]; then
+ rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
+ return
+ fi
+
for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done
install -d ${D}${base_bindir}
@@ -91,11 +96,6 @@ do_install_append() {
cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN}
}
-do_install_append_class-native(){
- # remove groups to fix conflict with shadow-native
- rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
-}
-
inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] coreutils: fix for native and nativesdk
2016-04-26 6:04 ` [PATCH 1/1] " Robert Yang
@ 2016-04-26 14:34 ` Denys Dmytriyenko
2016-04-26 16:42 ` Khem Raj
0 siblings, 1 reply; 7+ messages in thread
From: Denys Dmytriyenko @ 2016-04-26 14:34 UTC (permalink / raw)
To: Robert Yang; +Cc: openembedded-core
On Mon, Apr 25, 2016 at 11:04:37PM -0700, Robert Yang wrote:
> From: Dengke Du <dengke.du@windriver.com>
>
> The do_install_append is used for moving/renaming for ALTERNATIVE, but
> it breaks native, for example there is no ln, but ln.coreutils, that
> makes coreutils-native don't work. This patch fixes the problem.
>
> Signed-off-by: Dengke Du <dengke.du@windriver.com>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> meta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-core/coreutils/coreutils_8.25.bb b/meta/recipes-core/coreutils/coreutils_8.25.bb
> index 419a693..77b3862 100644
> --- a/meta/recipes-core/coreutils/coreutils_8.25.bb
> +++ b/meta/recipes-core/coreutils/coreutils_8.25.bb
> @@ -70,6 +70,11 @@ do_compile_prepend () {
> }
>
> do_install_append() {
> + if [ "${CLASSOVERRIDE}" = "class-native" ]; then
> + rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
> + return
> + fi
Would that skip the rest of do_install_append() for class-native due to the
return call? Is it expected?
> for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done
>
> install -d ${D}${base_bindir}
> @@ -91,11 +96,6 @@ do_install_append() {
> cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN}
> }
>
> -do_install_append_class-native(){
> - # remove groups to fix conflict with shadow-native
> - rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
> -}
> -
> inherit update-alternatives
>
> ALTERNATIVE_PRIORITY = "100"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] coreutils: fix for native and nativesdk
2016-04-26 14:34 ` Denys Dmytriyenko
@ 2016-04-26 16:42 ` Khem Raj
2016-04-27 1:10 ` Robert Yang
0 siblings, 1 reply; 7+ messages in thread
From: Khem Raj @ 2016-04-26 16:42 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2292 bytes --]
> On Apr 26, 2016, at 7:34 AM, Denys Dmytriyenko <denis@denix.org> wrote:
>
> On Mon, Apr 25, 2016 at 11:04:37PM -0700, Robert Yang wrote:
>> From: Dengke Du <dengke.du@windriver.com>
>>
>> The do_install_append is used for moving/renaming for ALTERNATIVE, but
>> it breaks native, for example there is no ln, but ln.coreutils, that
>> makes coreutils-native don't work. This patch fixes the problem.
>>
>> Signed-off-by: Dengke Du <dengke.du@windriver.com>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> meta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/meta/recipes-core/coreutils/coreutils_8.25.bb b/meta/recipes-core/coreutils/coreutils_8.25.bb
>> index 419a693..77b3862 100644
>> --- a/meta/recipes-core/coreutils/coreutils_8.25.bb
>> +++ b/meta/recipes-core/coreutils/coreutils_8.25.bb
>> @@ -70,6 +70,11 @@ do_compile_prepend () {
>> }
>>
>> do_install_append() {
>> + if [ "${CLASSOVERRIDE}" = "class-native" ]; then
>> + rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
>> + return
>> + fi
>
> Would that skip the rest of do_install_append() for class-native due to the
> return call? Is it expected?
it would ignore anything below it yes. Can this be done via override instead
do_something_class-native () { …. }
>
>
>> for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done
>>
>> install -d ${D}${base_bindir}
>> @@ -91,11 +96,6 @@ do_install_append() {
>> cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN}
>> }
>>
>> -do_install_append_class-native(){
>> - # remove groups to fix conflict with shadow-native
>> - rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
>> -}
>> -
>> inherit update-alternatives
>>
>> ALTERNATIVE_PRIORITY = "100"
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> 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
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] coreutils: fix for native and nativesdk
2016-04-26 16:42 ` Khem Raj
@ 2016-04-27 1:10 ` Robert Yang
0 siblings, 0 replies; 7+ messages in thread
From: Robert Yang @ 2016-04-27 1:10 UTC (permalink / raw)
To: Khem Raj, Denys Dmytriyenko; +Cc: openembedded-core
On 04/27/2016 12:42 AM, Khem Raj wrote:
>
>> On Apr 26, 2016, at 7:34 AM, Denys Dmytriyenko <denis@denix.org> wrote:
>>
>> On Mon, Apr 25, 2016 at 11:04:37PM -0700, Robert Yang wrote:
>>> From: Dengke Du <dengke.du@windriver.com>
>>>
>>> The do_install_append is used for moving/renaming for ALTERNATIVE, but
>>> it breaks native, for example there is no ln, but ln.coreutils, that
>>> makes coreutils-native don't work. This patch fixes the problem.
>>>
>>> Signed-off-by: Dengke Du <dengke.du@windriver.com>
>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>> ---
>>> meta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++-----
>>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/meta/recipes-core/coreutils/coreutils_8.25.bb b/meta/recipes-core/coreutils/coreutils_8.25.bb
>>> index 419a693..77b3862 100644
>>> --- a/meta/recipes-core/coreutils/coreutils_8.25.bb
>>> +++ b/meta/recipes-core/coreutils/coreutils_8.25.bb
>>> @@ -70,6 +70,11 @@ do_compile_prepend () {
>>> }
>>>
>>> do_install_append() {
>>> + if [ "${CLASSOVERRIDE}" = "class-native" ]; then
>>> + rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
>>> + return
>>> + fi
>>
>> Would that skip the rest of do_install_append() for class-native due to the
>> return call? Is it expected?
>
> it would ignore anything below it yes. Can this be done via override instead
Yes, thanks.
>
> do_something_class-native () { …. }
Updated in the repo:
git://git.openembedded.org/openembedded-core-contrib rbt/core
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/core
Dengke Du (1):
coreutils: fix for native and nativesdk
Author: Dengke Du <dengke.du@windriver.com>
Date: Mon Apr 25 22:59:19 2016 -0700
coreutils: fix for native and nativesdk
The do_install_append is used for moving/renaming for ALTERNATIVE, but
it breaks native, for example there is no ln, but ln.coreutils, that
makes coreutils-native don't work. This patch fixes the problem.
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
diff --git a/meta/recipes-core/coreutils/coreutils_8.25.bb
b/meta/recipes-core/coreutils/coreutils_8.25.bb
index 419a693..b1aaf53 100644
--- a/meta/recipes-core/coreutils/coreutils_8.25.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.25.bb
@@ -69,6 +69,15 @@ do_compile_prepend () {
mkdir -p ${B}/src
}
+do_install_class-native() {
+ autotools_do_install
+ # remove groups to fix conflict with shadow-native
+ rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
+ # The return is a must since native doesn't need the
+ # do_install_append() in the below.
+ return
+}
+
do_install_append() {
for i in df mktemp base64; do mv ${D}${bindir}/$i
${D}${bindir}/$i.${BPN}; done
@@ -91,11 +100,6 @@ do_install_append() {
cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN}
}
-do_install_append_class-native(){
- # remove groups to fix conflict with shadow-native
- rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
-}
-
inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"
// Robert
>>
>>
>>> for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done
>>>
>>> install -d ${D}${base_bindir}
>>> @@ -91,11 +96,6 @@ do_install_append() {
>>> cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN}
>>> }
>>>
>>> -do_install_append_class-native(){
>>> - # remove groups to fix conflict with shadow-native
>>> - rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
>>> -}
>>> -
>>> inherit update-alternatives
>>>
>>> ALTERNATIVE_PRIORITY = "100"
>>> --
>>> 2.7.4
>>>
>>> --
>>> _______________________________________________
>>> 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
>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/1] coreutils: fix for native and nativesdk
2016-04-26 6:04 [PATCH 0/1] coreutils: fix for native and nativesdk Robert Yang
2016-04-26 6:04 ` [PATCH 1/1] " Robert Yang
@ 2016-05-16 1:39 ` Robert Yang
1 sibling, 0 replies; 7+ messages in thread
From: Robert Yang @ 2016-05-16 1:39 UTC (permalink / raw)
To: openembedded-core
Ping.
// Robert
On 04/26/2016 02:04 PM, Robert Yang wrote:
> The following changes since commit e2dbe5eb869b8336b91023b83d7ca866197efa73:
>
> license.bbclass: make sure that image manifest dir exists (2016-04-22 16:28:47 +0100)
>
> are available in the git repository at:
>
> git://git.openembedded.org/openembedded-core-contrib rbt/core
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/core
>
> Dengke Du (1):
> coreutils: fix for native and nativesdk
>
> meta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-05-16 1:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-26 6:04 [PATCH 0/1] coreutils: fix for native and nativesdk Robert Yang
2016-04-26 6:04 ` [PATCH 1/1] " Robert Yang
2016-04-26 14:34 ` Denys Dmytriyenko
2016-04-26 16:42 ` Khem Raj
2016-04-27 1:10 ` Robert Yang
2016-05-16 1:39 ` [PATCH 0/1] " Robert Yang
-- strict thread matches above, loose matches on Subject: below --
2015-10-10 7:04 Robert Yang
2015-10-10 7:04 ` [PATCH 1/1] " Robert Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox