]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
diffutils: use new batch update-alternatives feature
authorKevin Tian <kevin.tian@intel.com>
Mon, 27 Sep 2010 04:42:16 +0000 (12:42 +0800)
committerRichard Purdie <rpurdie@linux.intel.com>
Wed, 29 Sep 2010 15:42:33 +0000 (16:42 +0100)
Signed-off-by Kevin Tian <kevin.tian@intel.com>

meta/recipes-extended/diffutils/diffutils_2.8.1.bb

index 86b46aafecddb1cb7fce3a5931a39374449f0f01..2b94cc79923a2b0667a4b4d07ef203945ead78b1 100644 (file)
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
 sdiff, and cmp utilities. These programs are usually \
 used for creating patch files."
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
 
@@ -16,23 +16,5 @@ inherit autotools update-alternatives gettext
 # see diffutils.mk in buildroot)
 EXTRA_OECONF_linux-uclibc = "--without-included-regex"
 
-do_install_append () {
-        mv ${D}${bindir}/diff ${D}${bindir}/diff.${PN}
-        mv ${D}${bindir}/cmp ${D}${bindir}/cmp.${PN}
-}
-
-ALTERNATIVE_NAME = "diff"
-ALTERNATIVE_PATH = "diff.${PN}"
+ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
 ALTERNATIVE_PRIORITY = "100"
-
-pkg_postinst_${PN} () {
-
-update-alternatives --install /usr/bin/cmp cmp cmp.diffutils 100
-
-}
-
-pkg_postrm_${PN} () {
-
-update-alternatives --remove cmp cmp.diffutils
-
-}