[oe-commits] org.oe.dev patch 2.5.9: Use alternatives for patch since busybox also provides a patch

[lenehan commit]

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

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 0178f3555db04402c37d7fa01bbe324fe5260c19
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0178f3555db04402c37d7fa01bbe324fe5260c19
Files:
1
packages/patch/patch.inc
packages/patch/patch_2.5.9.bb
Diffs:

#
# mt diff -r08efc5c4408013f45ebaf5fdeecddcbd6dc5d5ef -r0178f3555db04402c37d7fa01bbe324fe5260c19
#
# 
# 
# patch "packages/patch/patch.inc"
#  from [3c267c083c337efce1d7acbcd376faee6de68bd1]
#    to [2efe0addda31d5e2cd2502f75c675a64e4fdfb5d]
# 
# patch "packages/patch/patch_2.5.9.bb"
#  from [4f4dd78a350802f74faae9bdfc42d41f89f03e1a]
#    to [b895a8ac89bc2155f39b88bb77f709b6dcd6953a]
# 
============================================================
--- packages/patch/patch.inc	3c267c083c337efce1d7acbcd376faee6de68bd1
+++ packages/patch/patch.inc	2efe0addda31d5e2cd2502f75c675a64e4fdfb5d
@@ -8,4 +8,12 @@ S = "${WORKDIR}/patch-${PV}"
 SRC_URI = "${GNU_MIRROR}/patch/patch-${PV}.tar.gz"
 S = "${WORKDIR}/patch-${PV}"
 
+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"
-inherit autotools
============================================================
--- packages/patch/patch_2.5.9.bb	4f4dd78a350802f74faae9bdfc42d41f89f03e1a
+++ packages/patch/patch_2.5.9.bb	b895a8ac89bc2155f39b88bb77f709b6dcd6953a
@@ -7,4 +7,4 @@ S = "${WORKDIR}/patch-2.5.4"
            file://unified-reject-files.diff;patch=1 \
            file://global-reject-file.diff;patch=1 "
 S = "${WORKDIR}/patch-2.5.4"
+PR = "r2"
-PR = "r1"