diff options
| author |   Dengke Du <dengke.du@windriver.com> | 2016-04-25 22:59:19 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:34:43 +0100 |
| commit | 14bcfa16e33c09ce9898bd58872e4fdf56ed8325 (patch) | |
| tree | 03280283da769118f88d7dd4e5fdeab0bf019f2d /meta/recipes-core | |
| parent | 7ae869c4aa9153e53a8e033f87d68668c4bb0c69 (diff) | |
| download | openembedded-core-14bcfa16e33c09ce9898bd58872e4fdf56ed8325.tar.gz | |
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.
(From OE-Core rev: 1b5b831d1bbb92760ce01b38347cf0bcaa1bb59f)
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.25.bb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_8.25.bb b/meta/recipes-core/coreutils/coreutils_8.25.bb index 419a693372..b1aaf539fb 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" |