From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 23 Oct 2006 23:56:13 +0000 (+0000)
Subject: patch 2.5.9: Use alternatives for patch since busybox also provides a patch
X-Git-Tag: Release-2010-05/1~9453^2~567^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e035af68c660b8f5cd56ba1fa7a0262477216e1;p=openembedded.git

patch 2.5.9: Use alternatives for patch since busybox also provides a patch
command. As per #1472.
---

diff --git a/packages/patch/patch.inc b/packages/patch/patch.inc
index c8240ca3a9..4ce51703aa 100644
--- a/packages/patch/patch.inc
+++ b/packages/patch/patch.inc
@@ -8,4 +8,12 @@ SECTION = "utils"
 SRC_URI = "${GNU_MIRROR}/patch/patch-${PV}.tar.gz"
 S = "${WORKDIR}/patch-${PV}"
 
-inherit autotools
+inherit autotools update-alternatives
+
+do_install_append () {
+        mv ${D}${bindir}/patch ${D}${bindir}/patch.${PN}
+}
+
+ALTERNATIVE_NAME = "patch"
+ALTERNATIVE_PATH = "patch.${PN}"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/packages/patch/patch_2.5.9.bb b/packages/patch/patch_2.5.9.bb
index 940b15a205..ff485546fc 100644
--- a/packages/patch/patch_2.5.9.bb
+++ b/packages/patch/patch_2.5.9.bb
@@ -7,4 +7,4 @@ SRC_URI = "${GNU_MIRROR}/patch/patch-2.5.4.tar.gz \
            file://unified-reject-files.diff;patch=1 \
            file://global-reject-file.diff;patch=1 "
 S = "${WORKDIR}/patch-2.5.4"
-PR = "r1"
\ No newline at end of file
+PR = "r2"
\ No newline at end of file