From 36050de634791bbc249edbc465a3c5ea666c562e Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 12 Dec 2012 18:31:36 +0000 Subject: [PATCH] coreutils_6.9: Update the older coreutils to no longer provide 'su' 'su' was removed from newer versions of coreutils, and in OE-Core we pick up 'su' from shadow instead. So simply remove the binary from the install image to match expected behavior and avoid failures due to conflicting 'su' binaries during do_rootfs when building non-GPLv3 images. (From OE-Core rev: b4c5fc7c025ff864280be9678e6dd856971c71d7) Signed-off-by: Mark Hatle Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_6.9.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb index 1b25320..37d8dc9 100644 --- a/meta/recipes-core/coreutils/coreutils_6.9.bb +++ b/meta/recipes-core/coreutils/coreutils_6.9.bb @@ -8,7 +8,7 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/ls.c;beginline=4;endline=16;md5=15ed60f67b1db5fedd5dbc37cf8a9543" -PR = "r3" +PR = "r4" DEPENDS = "coreutils-native-${PV}" DEPENDS_class-native = "gettext-native" @@ -60,6 +60,10 @@ do_install() { # in update-alternatives to fail, therefore use lbracket - the name used # for the actual source file. mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN} + + # Newer versions of coreutils do not include su, to mimic this behavior + # we simply remove it. + rm -f ${D}${bindir}/su } inherit update-alternatives -- 2.7.4