Patchwork [v3,12/13] coreutils_6.9: Update the older coreutils to no longer provide 'su'

login
register
mail settings
Submitter Paul Eggleton
Date Dec. 12, 2012, 6:31 p.m.
Message ID <d1dd8eb6ecca5727986bab5522999fd102ea1479.1355337025.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/40843/
State New
Headers show

Comments

Paul Eggleton - Dec. 12, 2012, 6:31 p.m.
From: Mark Hatle <mark.hatle@windriver.com>

'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.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-core/coreutils/coreutils_6.9.bb |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 1b25320..0ad148b 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 binutils do not include su, to mimic this behavior
+	# we simply remove it.
+	rm -f ${D}${bindir}/su
 }
 
 inherit update-alternatives