[oe-commits] Tom Rini : gzip: Fix update-alternatives

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4a001e542a980bda4e71e205ee43ccb587fc5066
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4a001e542a980bda4e71e205ee43ccb587fc5066

Author: Tom Rini <tom_rini at mentor.com>
Date:   Mon Nov  1 16:09:26 2010 -0700

gzip: Fix update-alternatives

The rename was being done correctly in do_install (for just pn-gzip)
so remove a bad attempted rename in the postinst and suffix that and
prerm with pn-gzip while we're in here.

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 recipes/gzip/gzip_1.4.bb |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/recipes/gzip/gzip_1.4.bb b/recipes/gzip/gzip_1.4.bb
index 2c9e571..dda1035 100644
--- a/recipes/gzip/gzip_1.4.bb
+++ b/recipes/gzip/gzip_1.4.bb
@@ -4,7 +4,7 @@ the standard compression program for its system."
 SECTION = "console/utils"
 PRIORITY = "required"
 LICENSE = "GPL"
-PR = "1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz"
 SRC_URI[md5sum] = "e381b8506210c794278f5527cba0e765"
@@ -31,16 +31,15 @@ do_install_append_pn-gzip () {
     done
 }
 
-pkg_prerm_${PN} () {
+pkg_prerm_pn-gzip () {
     for alternative in ${alternatives}; do
         mv ${D}${base_bindir}/$alternative ${D}${base_bindir}/$alternative.${PN}
         update-alternatives --remove $alternative $alternative.${PN}
     done
 }
 
-pkg_postinst_${PN} () {
+pkg_postinst_pn-gzip () {
     for alternative in ${alternatives}; do
-        mv ${D}${base_bindir}/$alternative ${D}${base_bindir}/$alternative.${PN}
         update-alternatives --install ${base_bindir}/$alternative $alternative $alternative.${PN} 100
     done
 }