bzip2: use new batch update-alternatives feature

Signed-off-by: Kevin Tian <kevin.tian@intel.com>

diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.5.bb b/meta/recipes-extended/bzip2/bzip2_1.0.5.bb
index c6339c0676c9edc5ddbceecad03b16a6276283a6..1e858f4b117e6b210838ec015a921c1c48161d50 100644 (file)
--- a/meta/recipes-extended/bzip2/bzip2_1.0.5.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.5.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.bzip.org/"
 SECTION = "console/utils"
 LICENSE = "bzip2"
 LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \
            file://configure.ac \
@@ -11,7 +11,10 @@ SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \
 
 CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
 
-inherit autotools
+inherit autotools update-alternatives
+
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_LINKS = "${bindir}/bunzip2 ${bindir}/bzcat"
 
 do_configure_prepend () {
        cp ${WORKDIR}/configure.ac ${S}/
@@ -19,23 +22,5 @@ do_configure_prepend () {
        cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/
 }
 
-do_install_append () {
-       if [ "${BUILD_ARCH}" != "${HOST_ARCH}" ]; then
-               mv ${D}${bindir}/bunzip2 ${D}${bindir}/bunzip2.${PN}
-               mv ${D}${bindir}/bzcat ${D}${bindir}/bzcat.${PN}
-       fi
-}
-
-pkg_postinst_${PN} () {
-       update-alternatives --install ${bindir}/bunzip2 bunzip2 bunzip2.${PN} 100
-       update-alternatives --install ${bindir}/bzcat bzcat bzcat.${PN} 100
-}
-
-
-pkg_prerm_${PN} () {
-       update-alternatives --remove bunzip2 bunzip2.${PN}
-       update-alternatives --remove bzcat bzcat.${PN}
-}
-
 PROVIDES_append_virtclass-native = " bzip2-full-native"
 BBCLASSEXTEND = "native"