]> code.ossystems Code Review - openembedded-core.git/commitdiff
coreutils-native: don't install groups
authorWenzong Fan <wenzong.fan@windriver.com>
Fri, 28 Nov 2014 07:59:54 +0000 (02:59 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 5 Dec 2014 17:43:14 +0000 (17:43 +0000)
This binary is provided by shadow-native nowadays. Fixes:

  ERROR: The recipe coreutils-native is trying to install files \
    into a shared area when those files already exist. \
    Those files and their manifest location are: \
      .../tmp/sysroots/x86_64-linux/usr/bin/groups \
    Matched in manifest-x86_64-shadow-native.populate_sysroot

To reproduce the errors:

  $ bitbake shadow-native && bitbake coreutils-native

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-core/coreutils/coreutils_8.22.bb

index 6239600c6d116e5c2c16a8c04ecd9d0b9ca87428..f85bacabd30bd90036e289b5ba6c336dc4a4abf9 100644 (file)
@@ -74,6 +74,11 @@ do_install_append() {
        mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${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"