diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-04-16 11:15:35 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-24 15:51:33 +0100 |
| commit | e0626a0270fb0f4ff128e761c13d44162723434c (patch) | |
| tree | 0e05833194a03105ba007bde48b190aa685615f5 /meta | |
| parent | be2dbd1abfb4e0e6989d1c34c09047e439d8194e (diff) | |
| download | openembedded-core-e0626a0270fb0f4ff128e761c13d44162723434c.tar.gz openembedded-core-e0626a0270fb0f4ff128e761c13d44162723434c.tar.bz2 openembedded-core-e0626a0270fb0f4ff128e761c13d44162723434c.zip | |
gzip: Use update-alternatives class
Switch to using the update-alternatives class. Need this for
consistency and to ensure the necessary package provides get set.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/gzip/gzip.inc | 32 | ||||
| -rw-r--r-- | meta/recipes-extended/gzip/gzip_1.3.12.bb | 24 | ||||
| -rw-r--r-- | meta/recipes-extended/gzip/gzip_1.4.bb | 2 |
3 files changed, 18 insertions, 40 deletions
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc index a44944923c..1d608a6713 100644 --- a/meta/recipes-extended/gzip/gzip.inc +++ b/meta/recipes-extended/gzip/gzip.inc @@ -12,29 +12,15 @@ SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" inherit autotools -do_install () { - autotools_do_install - if [ "${PN}" = "${BPN}" ] ; then - # Rename and move files into /bin (FHS), which is typical place for gzip - install -d ${D}${base_bindir} - mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN} - mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN} - mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN} - fi +do_install_append () { + # Rename and move files into /bin (FHS), which is typical place for gzip + install -d ${D}${base_bindir} + mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip + mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip + mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat } -pkg_postinst_${PN} () { - if [ "${PN}" = "${BPN}" ] ; then - update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100 - update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100 - update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100 - fi -} +inherit update-alternatives -pkg_prerm_${PN} () { - if [ "${PN}" = "${BPN}" ] ; then - update-alternatives --remove gunzip gunzip.${PN} - update-alternatives --remove gzip gzip.${PN} - update-alternatives --remove zcat zcat.${PN} - fi -} +ALTERNATIVE_LINKS = "${base_bindir}/gunzip ${base_bindir}/gzip ${base_bindir}/zcat" +ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/gzip/gzip_1.3.12.bb b/meta/recipes-extended/gzip/gzip_1.3.12.bb index 2836942f8b..6d18d47cb8 100644 --- a/meta/recipes-extended/gzip/gzip_1.3.12.bb +++ b/meta/recipes-extended/gzip/gzip_1.3.12.bb @@ -16,29 +16,21 @@ SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz \ SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1" SRC_URI[sha256sum] = "3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af" -PR = "r0" +PR = "r1" inherit autotools -do_install () { - autotools_do_install +do_install_append () { # move files into /bin (FHS) install -d ${D}${base_bindir} - mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN} - mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN} - mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN} + mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip + mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip + mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat } -pkg_postinst_${PN} () { - update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100 - update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100 - update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100 -} +inherit update-alternatives -pkg_prerm_${PN} () { - update-alternatives --remove gunzip gunzip.${PN} - update-alternatives --remove gzip gzip.${PN} - update-alternatives --remove zcat zcat.${PN} -} +ALTERNATIVE_LINKS = "${base_bindir}/gunzip ${base_bindir}/gzip ${base_bindir}/zcat" +ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/gzip/gzip_1.4.bb b/meta/recipes-extended/gzip/gzip_1.4.bb index 8f4a237ec3..54dd50a96b 100644 --- a/meta/recipes-extended/gzip/gzip_1.4.bb +++ b/meta/recipes-extended/gzip/gzip_1.4.bb @@ -1,6 +1,6 @@ require gzip.inc -PR = "r1" +PR = "r2" NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" |