diffutils 2.8.1: Use alternatives for diff since busybox also supplies a

diff command. As per #1472.

diff --git a/packages/diffutils/diffutils_2.8.1.bb b/packages/diffutils/diffutils_2.8.1.bb
index e8de2ca..a0a7b7d 100644 (file)
--- a/packages/diffutils/diffutils_2.8.1.bb
+++ b/packages/diffutils/diffutils_2.8.1.bb
@@ -3,11 +3,11 @@ 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 @@ inherit autotools
 # 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"