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 c8240ca..4ce5170 100644 (file)
--- 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 940b15a..ff48554 100644 (file)
--- 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