From b797a842babd3d4ebad7d383346127a49269fd8b Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Mon, 27 Sep 2010 12:42:16 +0800 Subject: diffutils: use new batch update-alternatives feature Signed-off-by Kevin Tian --- meta/recipes-extended/diffutils/diffutils_2.8.1.bb | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb index 86b46aafe..2b94cc799 100644 --- a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb +++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb @@ -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 - -} -- cgit v1.2.3