From patchwork Wed Sep 18 05:11:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ra=C3=BAl_S=C3=A1nchez_Siles?= X-Patchwork-Id: 275596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id ABC652C00D0 for ; Wed, 18 Sep 2013 15:12:18 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 39EF493AE8; Wed, 18 Sep 2013 05:13:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WGC1OArFjNTI; Wed, 18 Sep 2013 05:13:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 90D1D93A4C; Wed, 18 Sep 2013 05:13:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7F6021BFA2C for ; Wed, 18 Sep 2013 05:12:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 76DD28040E for ; Wed, 18 Sep 2013 05:12:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3GXug3Ns-7h1 for ; Wed, 18 Sep 2013 05:12:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id 847748A8DF for ; Wed, 18 Sep 2013 05:12:12 +0000 (UTC) Received: by mail-wg0-f42.google.com with SMTP id m15so5238673wgh.1 for ; Tue, 17 Sep 2013 22:12:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:user-agent:mime-version :content-type; bh=EScYLjTEVa9IKzVuwc2VCxAyfNPZ8eG4BLYnZhc/ayo=; b=zmspOHfnvQzcK6BVNgsTpLuT2qQdNheBB5IxhcVqnkkMsxXfJJzrehp3Q4oLdqMcp+ pHsiMLonfiktj28T/69qcxgV/9Vd7pbfxbsNtXp8dxeNaIlISUuoHtKiIaQWDj9XtqjZ 4gL+8A7kCOC9RuIU4mwLEHJsZoMVxu4QC5YFL9GQYfJL7H18/IrHDo+fHxJkjjB+y8dB BbPC7PnEi1704k9XUv6NlS5l2g7KVdFfGakYrkVxU/LJLUQ7fSL9gq78FYxhb6iErQCN L7PlBJZqxl91ghWHq0WQUHJJBVz/HAdoakR017Wr6LFxaZRf/ghiKder9CgtrJjviRf7 /U4g== X-Received: by 10.180.76.171 with SMTP id l11mr5396724wiw.39.1379481131088; Tue, 17 Sep 2013 22:12:11 -0700 (PDT) Received: from portaka.localnet (92.31.219.87.dynamic.jazztel.es. [87.219.31.92]) by mx.google.com with ESMTPSA id e5sm8841829wiy.2.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Sep 2013 22:12:10 -0700 (PDT) From: =?ISO-8859-1?Q?Ra=FAl_S=E1nchez?= Siles To: buildroot@busybox.net Date: Wed, 18 Sep 2013 07:11:43 +0200 Message-ID: <2228068.y4thvyPt1K@portaka> X-Face: "Y8c-P6z#xzVu3N?e6eA%4eFyIMQ&lM[0$ List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net According to user manual "generic-package Reference" section, LIBFOO_VERSION could refer to a branch or tag. This patch adds supports for this in the svn method case for the repositories following the branches/tags/trunk layout. Examples: LIBFOO_VERSION = tags/v3.2.1 LIBFOO_SITE = svn://svn.server.net/myproject LIBFOO2_VERSION = branches/featureA LIBFOO2_SITE = http://svn.happyserver.net/theproject LIBFOO2_SITE_METHOD = svn Signed-off-by: Raúl Sánchez Siles --- docs/manual/adding-packages-generic.txt | 2 ++ package/pkg-download.mk | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index cb067bd..df43e82 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -206,6 +206,8 @@ information is (assuming the package name is +libfoo+) : +LIBFOO_VERSION = 0.1.2+ + +LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057+ + +LIBFOO_VERSION = stable+ + +LIBFOO_VERSION = tags/v3.2.1+ (svn method only) + +LIBFOO_VERSION = branches/featureA+ (svn method only) * +LIBFOO_SOURCE+ may contain the name of the tarball of the package. If +HOST_LIBFOO_SOURCE+ is not specified, it diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 8e4a1ec..bc236ff 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -141,7 +141,9 @@ endef define DOWNLOAD_SVN test -e $(DL_DIR)/$($(PKG)_SOURCE) || \ (pushd $(DL_DIR) > /dev/null && \ - $(SVN) export -r $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_DL_DIR) && \ + ($(SVN) info $($(PKG)_SITE)/$($(PKG)_DL_VERSION) > /dev/null && \ + $(SVN) export -r HEAD $($(PKG)_SITE)/$($(PKG)_DL_VERSION) $($(PKG)_DL_DIR) || \ + $(SVN) export -r $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_DL_DIR) ) && \ $(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \ rm -rf $($(PKG)_DL_DIR) && \ popd > /dev/null)