Patchwork [18/22] time: use u-a for time, conflicts with busybox

login
register
mail settings
Submitter Martin Jansa
Date Nov. 11, 2011, 4:28 p.m.
Message ID <014f5fe4b85f6ac2bca3e35b6b649b3746af21da.1321028799.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/14847/
State Accepted
Commit 4ed8241b58ad3180311fc20cb6ef26acf44058b4
Headers show

Comments

Martin Jansa - Nov. 11, 2011, 4:28 p.m.
* it was reported here:
  http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009409.html

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-extended/time/time.inc    |   10 ++++++++++
 meta/recipes-extended/time/time_1.7.bb |    2 ++
 2 files changed, 12 insertions(+), 0 deletions(-)

Patch

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"