diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-12-12 18:31:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-13 15:18:46 +0000 |
commit | 71594f81b8c6a3ecc8f0d738cb7952e4c7b92d69 (patch) | |
tree | 5a57810279679269e2231e0b7b6435960b746fc2 | |
parent | 1f476dbb22197f3378b727675c1a8109ecf14249 (diff) | |
download | poky-71594f81b8c6a3ecc8f0d738cb7952e4c7b92d69.tar.gz |
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 <mark.hatle@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/coreutils/coreutils_6.9.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb index 1b25320628..37d8dc9d51 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" | |||
8 | LICENSE = "GPLv2+" | 8 | LICENSE = "GPLv2+" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ |
10 | file://src/ls.c;beginline=4;endline=16;md5=15ed60f67b1db5fedd5dbc37cf8a9543" | 10 | file://src/ls.c;beginline=4;endline=16;md5=15ed60f67b1db5fedd5dbc37cf8a9543" |
11 | PR = "r3" | 11 | PR = "r4" |
12 | DEPENDS = "coreutils-native-${PV}" | 12 | DEPENDS = "coreutils-native-${PV}" |
13 | DEPENDS_class-native = "gettext-native" | 13 | DEPENDS_class-native = "gettext-native" |
14 | 14 | ||
@@ -60,6 +60,10 @@ do_install() { | |||
60 | # in update-alternatives to fail, therefore use lbracket - the name used | 60 | # in update-alternatives to fail, therefore use lbracket - the name used |
61 | # for the actual source file. | 61 | # for the actual source file. |
62 | mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN} | 62 | mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN} |
63 | |||
64 | # Newer versions of coreutils do not include su, to mimic this behavior | ||
65 | # we simply remove it. | ||
66 | rm -f ${D}${bindir}/su | ||
63 | } | 67 | } |
64 | 68 | ||
65 | inherit update-alternatives | 69 | inherit update-alternatives |