On 04/27/2016 12:42 AM, Khem Raj wrote:
On Apr 26, 2016, at 7:34 AM, Denys Dmytriyenko <de...@denix.org> wrote:
On Mon, Apr 25, 2016 at 11:04:37PM -0700, Robert Yang wrote:
From: Dengke Du <dengke...@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...@windriver.com>
Signed-off-by: Robert Yang <liezhi.y...@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...@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...@windriver.com>
Signed-off-by: Robert Yang <liezhi.y...@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
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
