coreutils: fix for native and nativesdk
cover coreutils: fix for native and nativesdk
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(-)
Signature · 1 line
2.7.4
PATCH 1/1 coreutils: fix for native and nativesdk
From: Dengke Du <[email protected]>
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.
--- meta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-core/coreutils/coreutils_8.25.bb +5 -5
@@ -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"
Signature · 1 line
2.7.4
Quoted 17 lines · Robert Yang
From: Dengke Du <[email protected]>
The
do_install_appendis 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 <[email protected]>Signed-off-by Robert Yang <[email protected]>--- meta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)meta/recipes-core/coreutils/coreutils_8.25.bb +0
-0
meta/recipes-core/coreutils/coreutils_8.25.bb do_compile_prepend () { · line 76
Quoted 7 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +4
-0@@ -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?
Quoted 23 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +0
-5for 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"Signature · 7 lines
2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 23 lines · Denys Dmytriyenko
Quoted 19 lines · Robert Yang
From: Dengke Du <[email protected]>
The
do_install_appendis 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 <[email protected]>Signed-off-by Robert Yang <[email protected]>---
meta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)meta/recipes-core/coreutils/coreutils_8.25.bb +0
-0@@ -70,6 +70,11 @@ do_compile_prepend () { }
Quoted 8 lines
meta/recipes-core/coreutils/coreutils_8.25.bb do_compile_prepend () { · line 76
Quoted 5 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +4
-0do_install_append() { + if [ "${CLASSOVERRIDE}" = "class-native" ]; then + rm -f ${D}${STAGING_BINDIR_NATIVE}/groups + return + fiWould 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 () { …. }
Quoted 30 lines
Quoted 20 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +0
-5for 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.4Quoted 5 lines
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 32 lines · Khem Raj
Quoted 23 lines · Denys Dmytriyenko
Quoted 19 lines · Robert Yang
From: Dengke Du <[email protected]>
The
do_install_appendis 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 <[email protected]>Signed-off-by Robert Yang <[email protected]>---
meta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)meta/recipes-core/coreutils/coreutils_8.25.bb +0
-0@@ -70,6 +70,11 @@ do_compile_prepend () { }Quoted 8 lines
meta/recipes-core/coreutils/coreutils_8.25.bb do_compile_prepend () { · line 76
Quoted 5 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +4
-0do_install_append() { + if [ "${CLASSOVERRIDE}" = "class-native" ]; then + rm -f ${D}${STAGING_BINDIR_NATIVE}/groups + return + fiWould that skip the rest of
do_install_append()for class-native due to the return call? Is it expected?
Quoted 1 line
it would ignore anything below it yes. Can this be done via override instead
Yes, thanks.
Quoted 2 lines
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 <[email protected]> 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.
meta/recipes-core/coreutils/coreutils_8.25.bb +9 -0
@@ -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
Quoted 31 lines
Quoted 30 lines
Quoted 20 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +0
-5for 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.4Quoted 5 lines
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ping.
// Robert
Quoted 15 lines · Robert Yang
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-contribrbt/core
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/coreDengke Du (1):
coreutils: fix for native and nativesdkmeta/recipes-core/coreutils/coreutils_8.25.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)