From patchwork Thu Jun 26 13:17:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 364540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 512A11400AB for ; Thu, 26 Jun 2014 23:19:02 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 202938B74E; Thu, 26 Jun 2014 13:19:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wZOFJsnvvXiD; Thu, 26 Jun 2014 13:18:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5555A8B73F; Thu, 26 Jun 2014 13:18:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 3571E1BF997 for ; Thu, 26 Jun 2014 13:18:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2F8CA2FFCC for ; Thu, 26 Jun 2014 13:18:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 156IBT9OsYXR for ; Thu, 26 Jun 2014 13:18:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs02.rockwellcollins.com (secvs02.rockwellcollins.com [205.175.225.241]) by silver.osuosl.org (Postfix) with ESMTPS id E55D32FD80 for ; Thu, 26 Jun 2014 13:18:43 +0000 (UTC) Received: from nosuchhost.198.131.in-addr.arpa (HELO crulimr01.rockwellcollins.com) ([131.198.26.129]) by mail-virt.rockwellcollins.com with ESMTP; 26 Jun 2014 08:18:05 -0500 Received: from localhost.localdomain (crp23381.rockwellcollins.com [131.199.238.79]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id 4A37F601A8; Thu, 26 Jun 2014 08:18:05 -0500 (CDT) From: Ryan Barnett To: buildroot@buildroot.org Date: Thu, 26 Jun 2014 08:17:39 -0500 Message-Id: <1403788659-1936-1-git-send-email-ryan.barnett@rockwellcollins.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH 1/1] pkg-download: fix svn download for deleted path X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net If a SVN path has been deleted in a future revision, downloading a package's source will fail using 'svn checkout -r'. Fix using URL@REV syntax since the SVN command will then verify the path at the specified version. Without using the URL@REV syntax, the SVN command will attempt to verify the path exists on the the HEAD revision before checking out the path at the specified revision. Error seen if SVN path has been deleted in HEAD using svn checkout -r: svn: E160013: '/svn/path/' path not found Signed-off-by: Ryan Barnett Reviewed-by: "Yann E. MORIN" --- package/pkg-download.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 4cfb913..e07fd1b 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -145,14 +145,14 @@ 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) export $($(PKG)_SITE)@$($(PKG)_DL_VERSION) $($(PKG)_DL_DIR) && \ $(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \ rm -rf $($(PKG)_DL_DIR) && \ popd > /dev/null) endef define SOURCE_CHECK_SVN - $(SVN) ls $($(PKG)_SITE) > /dev/null + $(SVN) ls $($(PKG)_SITE)@$($(PKG)_DL_VERSION) > /dev/null endef define SHOW_EXTERNAL_DEPS_SVN