summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-07-26 16:09:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 14:18:38 +0100
commit6a76ad8a45b4e099703c051d759f687904442713 (patch)
tree6d4a46e0772c8301891df21945f309d11800e436 /meta/recipes-devtools/patch
parentfc408785ed2b9be00b25a725e666f6428292a418 (diff)
downloadopenembedded-core-6a76ad8a45b4e099703c051d759f687904442713.tar.gz
openembedded-core-6a76ad8a45b4e099703c051d759f687904442713.tar.bz2
openembedded-core-6a76ad8a45b4e099703c051d759f687904442713.zip
patch: cleanup update-alternatives deprecated code
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/patch')
-rw-r--r--meta/recipes-devtools/patch/patch.inc7
-rw-r--r--meta/recipes-devtools/patch/patch_2.5.9.bb2
-rw-r--r--meta/recipes-devtools/patch/patch_2.6.1.bb2
3 files changed, 3 insertions, 8 deletions
diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
index 21c06c64b5..332b97a85e 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 4d27cbdb8d..c29b240756 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 fce3656069..50557477da 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 "