[oe] [PATCH] Revert "unzip: Add update-alternatives to unzip"

[Paul Menzel]

Date: Sat, 13 Nov 2010 14:49:28 +0100

This reverts commit 902b98f32ffd35661e43382f47226f65528ff1b1.

With this patch, decompressing zip files does not work anymore in `angstrom-2008.1, angstrom-2010.x`, `minimal` and `minimal-uclibc`.

        /oe/build-angstrom-next$ bitbake -k jasper
        […]
        NOTE: package jasper-1.900.1-r1: task do_unpack: Started
        NOTE: Unpacking ../downloads/jasper-1.900.1.zip to angstrom-dev/work/armv7a-angstrom-linux-gnueabi/jasper-1.900.1-r1/
        FATAL: Unable to unpack '/oe/downloads/jasper-1.900.1.zip' to '/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/jasper-1.900.1-r1' (cmd: unzip -q -o '/home/paul/oe/downloads/jasper-1.900.1.zip'):
        Execution of 'unzip -q -o '/oe/downloads/jasper-1.900.1.zip'' failed with exit code 127:
        /bin/sh: unzip: command not found
        
        ERROR: TaskFailed event exception, aborting
        ERROR: Build of /oe/openembedded/recipes/perl/perl-native_5.10.1.bb do_compile failed
        ERROR: TaskFailed event exception, aborting
        ERROR: Build of /oe/openembedded/recipes/jpeg/jasper_1.900.1.bb do_distribute_sources failed
        /oe/build-angstrom-next$ find . -name unzip
        ./angstrom-dev/work/i686-linux/unzip-native-552-r2/unzip-5.52/unzip

I do not know what in Tom’s patch might cause this behavior but reverting this patch fixes the problem for me.

Please note, that `unzip` is not installed on my build host.

Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
 recipes/unzip/unzip_552.bb |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/recipes/unzip/unzip_552.bb b/recipes/unzip/unzip_552.bb
index 0decc4a..6e3497e 100644
--- a/recipes/unzip/unzip_552.bb
+++ b/recipes/unzip/unzip_552.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A (de)compression library for the ZIP format"
 SECTION = "console/utils"
 LICENSE = "Info-ZIP"
-PR = "r2"
+PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/infozip/UnZip%205.x%20and%20earlier/5.52/unzip${PV}.tar.gz"
 S = "${WORKDIR}/unzip-5.52"
 
@@ -19,15 +19,6 @@ do_install() {
         oe_runmake -f unix/Makefile install prefix=${D}${prefix}
 	install -d ${D}${mandir}
 	mv ${D}${prefix}/man/* ${D}${mandir}
-	mv ${D}${bindir}/unzip ${D}${bindir}/unzip.${PN}
-}
-
-pkg_postinst_${PN} () {
-	update-alternatives --install ${bindir}/unzip unzip unzip.${PN} 100
-}
-
-pkg_prerm_${PN} () {
-	update-alternatives --remove unzip unzip.${PN}
 }
 
 SRC_URI[md5sum] = "9d23919999d6eac9217d1f41472034a9"
-- 
1.7.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20101113/35bb150e/attachment-0002.sig>