From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1RSopI-0001JE-PO
	for ptxdist@pengutronix.de; Tue, 22 Nov 2011 12:47:48 +0100
Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1RSopI-0002yK-OF
	for ptxdist@pengutronix.de; Tue, 22 Nov 2011 12:47:48 +0100
Date: Tue, 22 Nov 2011 12:47:48 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20111122114748.GH10058@pengutronix.de>
References: <201111221143.00650.tstone@iss.tu-darmstadt.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <201111221143.00650.tstone@iss.tu-darmstadt.de>
Subject: Re: [ptxdist] ptxdist-2011.11.0 regression on extract
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

On Tue, Nov 22, 2011 at 11:42:59AM +0100, Tim Sander wrote:
> Hi
> 
> I just ran into an error with my own package of host-gchart.
> 
> It downloads gchart-2.7.zip and extracts it:
> $(call extract, HOST_CHART, $(HOST_GCHART_DIR))
> 
> This works without problems in ptxdist-2011.04.1.
> 
> With 2011.11.0 the $(HOST_GCHART_DIR) contains the first directory of the 
> zipfile (javadoc) and not the zipfile root.
> 
> Best regards
> Tim

> ## SECTION=hosttools_noprompt
> 
> config HOST_GCHART
> 	tristate
> 	default ALLYES

> # -*-makefile-*-
> #
> # Copyright (C) 2011 by Tim Sander <tim.sander@hbm.com>
> #
> # See CREDITS for details about who has contributed to this project.
> #
> # For further information about the PTXdist project and license conditions
> # see the README file.
> #
> 
> #
> # We provide this package
> #
> HOST_PACKAGES-$(PTXCONF_HOST_GCHART) += host-gchart
> 
> #
> # Paths and names
> #
> HOST_GCHART_VERSION	:= 2.7
> HOST_GCHART		:= gchart-$(HOST_GCHART_VERSION)
> HOST_GCHART_SUFFIX	:= zip
> HOST_GCHART_URL	:= http://clientsidegchart.googlecode.com/files/$(HOST_GCHART).$(HOST_GCHART_SUFFIX)
> HOST_GCHART_SOURCE	:= $(SRCDIR)/$(HOST_GCHART).$(HOST_GCHART_SUFFIX)
> HOST_GCHART_DIR	:= $(HOST_BUILDDIR)/$(HOST_GCHART)
> HOST_GCHART_LICENSE	:= Apache2.0

HOST_GCHART_STRIP_LEVEL	:= 0

> 
> # ----------------------------------------------------------------------------
> # Get
> # ----------------------------------------------------------------------------
> 
> $(HOST_GCHART_SOURCE):
> 	@$(call targetinfo)
> 	@$(call get, HOST_GCHART)
> 
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
> 
> $(STATEDIR)/host-gchart.prepare:
> 	@$(call targetinfo)
> 	@$(call touch)
> # ----------------------------------------------------------------------------
> # Extract
> # ----------------------------------------------------------------------------
> 
> $(STATEDIR)/host-gchart.extract:
> 	@$(call targetinfo)
> 	@$(call clean)

	@$(call extract, HOST_GCHART)

or just remove the extract stage.

The change was made, so we can set <PKG>_DIR to something other than what's
inside the archive. Unfortunately the change broke a hand full of packages
like this one.

Michael

> 	@$(call touch)
> 
> # ----------------------------------------------------------------------------
> # Compile
> # ----------------------------------------------------------------------------
> 
> $(STATEDIR)/host-gchart.compile:
> 	@$(call targetinfo)
> 	@$(call touch)
> 
> # ----------------------------------------------------------------------------
> # Install
> # ----------------------------------------------------------------------------
> 
> $(STATEDIR)/host-gchart.install:
> 	@$(call targetinfo)
> 	@$(call touch)
> 
> # vim: syntax=make

> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de