[oe-commits] org.oe.dev diffutils 2.8.1: Use alternatives for diff since busybox also supplies a

[lenehan commit]

diffutils 2.8.1: Use alternatives for diff since busybox also supplies a
diff command. As per #1472.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 4e2152324702b8da09ba81f5bfccb916fb80903e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4e2152324702b8da09ba81f5bfccb916fb80903e
Files:
1
packages/diffutils/diffutils_2.8.1.bb
Diffs:

#
# mt diff -r19c78f411279b8c7783d77ab610770212d3d1236 -r4e2152324702b8da09ba81f5bfccb916fb80903e
#
# 
# 
# patch "packages/diffutils/diffutils_2.8.1.bb"
#  from [43d87b48299ae4d1dc8384fbd2f7227f8de8dd54]
#    to [f65140ead392f9fb8acae02e1ad6211ff3da6a70]
# 
============================================================
--- packages/diffutils/diffutils_2.8.1.bb	43d87b48299ae4d1dc8384fbd2f7227f8de8dd54
+++ packages/diffutils/diffutils_2.8.1.bb	f65140ead392f9fb8acae02e1ad6211ff3da6a70
@@ -1,13 +1,13 @@ used for creating patch files."
 SECTION = "base"
 LICENSE = "GPL"
 DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
 sdiff, and cmp utilities. These programs are usually \
 used for creating patch files."
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
 
-inherit autotools
+inherit autotools update-alternatives
 
 # diffutils assumes non-glibc compilation with uclibc and
 # this causes it to generate its own implementations of
@@ -15,3 +15,11 @@ EXTRA_OECONF_linux-uclibc = "--without-i
 # because it uses __mempcpy, there are other things (TBD:
 # see diffutils.mk in buildroot)
 EXTRA_OECONF_linux-uclibc = "--without-included-regex"
+
+do_install_append () {
+        mv ${D}${bindir}/diff ${D}${bindir}/diff.${PN}
+}
+
+ALTERNATIVE_NAME = "diff"
+ALTERNATIVE_PATH = "diff.${PN}"
+ALTERNATIVE_PRIORITY = "100"