From patchwork Mon Nov 14 04:28:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 11/21] time: use u-a for time, conflicts with busybox Date: Mon, 14 Nov 2011 04:28:01 -0000 From: Saul Wold X-Patchwork-Id: 14913 Message-Id: <0f778a42d4a55d9786e210a3327f10908fa7be17.1321244755.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Martin Jansa * it was reported here: http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009409.html Signed-off-by: Martin Jansa --- meta/recipes-extended/time/time.inc | 10 ++++++++++ meta/recipes-extended/time/time_1.7.bb | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/meta/recipes-extended/time/time.inc b/meta/recipes-extended/time/time.inc index 2d9dab8..401288b 100644 --- a/meta/recipes-extended/time/time.inc +++ b/meta/recipes-extended/time/time.inc @@ -6,3 +6,13 @@ SECTION = "utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +inherit update-alternatives + +do_install_append () { + mv ${D}${bindir}/time ${D}${bindir}/time.${PN} +} + +ALTERNATIVE_NAME = "time" +ALTERNATIVE_LINK = "${bindir}/time" +ALTERNATIVE_PATH = "${bindir}/time.${PN}" +ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/time/time_1.7.bb b/meta/recipes-extended/time/time_1.7.bb index 35afb1e..c38608f 100644 --- a/meta/recipes-extended/time/time_1.7.bb +++ b/meta/recipes-extended/time/time_1.7.bb @@ -1,5 +1,7 @@ require time.inc +PR = "r1" + SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \ file://debian.patch"