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:26:28 +0100
commit197c77b661df3406c14f973a81f48aad443875fc (patch)
tree9605eae1f450c75e321d019781b1f7afe22e70ff /meta/recipes-devtools/patch
parentcc0c08fa2c902f723e3036753d3d8d9e1577731b (diff)
downloadpoky-197c77b661df3406c14f973a81f48aad443875fc.tar.gz
patch: cleanup update-alternatives deprecated code
(From OE-Core rev: 6a76ad8a45b4e099703c051d759f687904442713) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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}"
9 9
10inherit autotools update-alternatives 10inherit autotools update-alternatives
11 11
12do_install_append () { 12ALTERNATIVE_${PN} = "patch"
13 mv ${D}${bindir}/patch ${D}${bindir}/patch.${BPN}
14}
15
16ALTERNATIVE_NAME = "patch"
17ALTERNATIVE_PATH = "patch.${BPN}"
18ALTERNATIVE_PRIORITY = "100" 13ALTERNATIVE_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 \
5 file://install.patch \ 5 file://install.patch \
6 file://unified-reject-files.diff \ 6 file://unified-reject-files.diff \
7 file://global-reject-file.diff " 7 file://global-reject-file.diff "
8PR = "r2" 8PR = "r3"
9 9
10LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 10LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
11SRC_URI[md5sum] = "dacfb618082f8d3a2194601193cf8716" 11SRC_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 @@
1require patch.inc 1require patch.inc
2LICENSE = "GPLv3" 2LICENSE = "GPLv3"
3 3
4PR = "r0" 4PR = "r1"
5 5
6SRC_URI += " file://global-reject-file.diff " 6SRC_URI += " file://global-reject-file.diff "
7 7