patch: cleanup update-alternatives deprecated code

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

diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
index 21c06c64b54d2651f60efdf3404d2c2def24ff41..332b97a85e6d162430ddf1cf49a5fc7af54fa041 100644 (file)
--- 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 4d27cbdb8d36b82fd0a287232eee0c59b44dbafc..c29b2407566e4e919005463d433abbe66cc6016d 100644 (file)
--- 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 fce3656069f0c63d1e7c06679cb9bea6d922637a..50557477dad6408f3aff6df8021bd5fa404d0880 100644 (file)
--- 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 "