From: Saul Wold <sgw@linux.intel.com>
Date: Fri, 27 Jul 2012 00:26:09 +0000 (-0700)
Subject: time: cleanup update-alternatives deprecated code
X-Git-Tag: yocto-4.0~35951
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75a086630fdf118db3bd2bda12532370d3175081;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

time: cleanup update-alternatives deprecated code

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-extended/time/time.inc b/meta/recipes-extended/time/time.inc
index 8e35843a679..028da7cd024 100644
--- a/meta/recipes-extended/time/time.inc
+++ b/meta/recipes-extended/time/time.inc
@@ -8,11 +8,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
 inherit update-alternatives
 
-do_install_append () {
-        mv ${D}${bindir}/time ${D}${bindir}/time.${BPN}
-}
-
-ALTERNATIVE_NAME = "time"
-ALTERNATIVE_LINK = "${bindir}/time"
-ALTERNATIVE_PATH = "${bindir}/time.${BPN}"
+ALTERNATIVE_${PN} = "time"
 ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/time/time_1.7.bb b/meta/recipes-extended/time/time_1.7.bb
index c38608fd9eb..92c5353d099 100644
--- a/meta/recipes-extended/time/time_1.7.bb
+++ b/meta/recipes-extended/time/time_1.7.bb
@@ -1,6 +1,6 @@
 require time.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
 	   file://debian.patch"