Patchwork [CONSOLIDATED,REQUEST,30/64] time: cleanup update-alternatives deprecated code

login
register
mail settings
Submitter Saul Wold
Date Aug. 14, 2012, 12:13 p.m.
Message ID <be621b44d184eb77bc19078c3180e6b5ca3065d4.1344946189.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/34529/
State Accepted
Commit 75a086630fdf118db3bd2bda12532370d3175081
Headers show

Comments

Saul Wold - Aug. 14, 2012, 12:13 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/time/time.inc    |    8 +-------
 meta/recipes-extended/time/time_1.7.bb |    2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

Patch

diff --git a/meta/recipes-extended/time/time.inc b/meta/recipes-extended/time/time.inc
index 8e35843..028da7c 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 c38608f..92c5353 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"