Patchwork [CONSOLIDATED,REQUEST,08/64] patch: cleanup update-alternatives deprecated code

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

Comments

Saul Wold - Aug. 14, 2012, 12:12 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/patch/patch.inc      |    7 +------
 meta/recipes-devtools/patch/patch_2.5.9.bb |    2 +-
 meta/recipes-devtools/patch/patch_2.6.1.bb |    2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

Patch

diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
index 21c06c6..332b97a 100644
--- a/meta/recipes-devtools/patch/patch.inc
+++ b/meta/recipes-devtools/patch/patch.inc
@@ -9,10 +9,5 @@  S = "${WORKDIR}/patch-${PV}"
 
 inherit autotools update-alternatives
 
-do_install_append () {
-        mv ${D}${bindir}/patch ${D}${bindir}/patch.${BPN}
-}
-
-ALTERNATIVE_NAME = "patch"
-ALTERNATIVE_PATH = "patch.${BPN}"
+ALTERNATIVE_${PN} = "patch"
 ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-devtools/patch/patch_2.5.9.bb b/meta/recipes-devtools/patch/patch_2.5.9.bb
index 4d27cbd..c29b240 100644
--- a/meta/recipes-devtools/patch/patch_2.5.9.bb
+++ b/meta/recipes-devtools/patch/patch_2.5.9.bb
@@ -5,7 +5,7 @@  SRC_URI += " file://debian.patch \
 	   file://install.patch \
            file://unified-reject-files.diff \
            file://global-reject-file.diff "
-PR = "r2"
+PR = "r3"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRC_URI[md5sum] = "dacfb618082f8d3a2194601193cf8716"
diff --git a/meta/recipes-devtools/patch/patch_2.6.1.bb b/meta/recipes-devtools/patch/patch_2.6.1.bb
index fce3656..5055747 100644
--- a/meta/recipes-devtools/patch/patch_2.6.1.bb
+++ b/meta/recipes-devtools/patch/patch_2.6.1.bb
@@ -1,7 +1,7 @@ 
 require patch.inc
 LICENSE = "GPLv3"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += " file://global-reject-file.diff "