diff options
author | Dengke Du <dengke.du@windriver.com> | 2016-04-25 22:59:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-17 14:43:29 +0100 |
commit | 4725d9021d1c27046cba531c1c357cc875b0d5fa (patch) | |
tree | 0f1eca4d23f89a67cab8cfb8a5b62e6bfe8dda52 | |
parent | da53c7db9e66297c5f864381c31d302b55822577 (diff) | |
download | poky-4725d9021d1c27046cba531c1c357cc875b0d5fa.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>
-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 () { | |||
69 | mkdir -p ${B}/src | 69 | mkdir -p ${B}/src |
70 | } | 70 | } |
71 | 71 | ||
72 | do_install_class-native() { | ||
73 | autotools_do_install | ||
74 | # remove groups to fix conflict with shadow-native | ||
75 | rm -f ${D}${STAGING_BINDIR_NATIVE}/groups | ||
76 | # The return is a must since native doesn't need the | ||
77 | # do_install_append() in the below. | ||
78 | return | ||
79 | } | ||
80 | |||
72 | do_install_append() { | 81 | do_install_append() { |
73 | for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done | 82 | for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done |
74 | 83 | ||
@@ -91,11 +100,6 @@ do_install_append() { | |||
91 | cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN} | 100 | cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN} |
92 | } | 101 | } |
93 | 102 | ||
94 | do_install_append_class-native(){ | ||
95 | # remove groups to fix conflict with shadow-native | ||
96 | rm -f ${D}${STAGING_BINDIR_NATIVE}/groups | ||
97 | } | ||
98 | |||
99 | inherit update-alternatives | 103 | inherit update-alternatives |
100 | 104 | ||
101 | ALTERNATIVE_PRIORITY = "100" | 105 | ALTERNATIVE_PRIORITY = "100" |