* [Buildroot] [PATCH 1/1] pkg-download: fix svn download for deleted path
@ 2014-06-26 13:17 Ryan Barnett
2014-06-26 16:30 ` Yann E. MORIN
2014-06-29 8:43 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Ryan Barnett @ 2014-06-26 13:17 UTC (permalink / raw)
To: buildroot
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 at REV syntax since the SVN command will then verify the path at the
specified version. Without using the URL at 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 <ryan.barnett@rockwellcollins.com>
---
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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] pkg-download: fix svn download for deleted path
2014-06-26 13:17 [Buildroot] [PATCH 1/1] pkg-download: fix svn download for deleted path Ryan Barnett
@ 2014-06-26 16:30 ` Yann E. MORIN
2014-06-29 8:43 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2014-06-26 16:30 UTC (permalink / raw)
To: buildroot
Ryan, All,
On 2014-06-26 08:17 -0500, Ryan Barnett spake thusly:
> 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 at REV syntax since the SVN command will then verify the path at the
> specified version. Without using the URL at 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 <ryan.barnett@rockwellcollins.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
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
> --
> 1.7.9.5
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] pkg-download: fix svn download for deleted path
2014-06-26 13:17 [Buildroot] [PATCH 1/1] pkg-download: fix svn download for deleted path Ryan Barnett
2014-06-26 16:30 ` Yann E. MORIN
@ 2014-06-29 8:43 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2014-06-29 8:43 UTC (permalink / raw)
To: buildroot
Dear Ryan Barnett,
On Thu, 26 Jun 2014 08:17:39 -0500, Ryan Barnett wrote:
> 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 at REV syntax since the SVN command will then verify the path at the
> specified version. Without using the URL at 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 <ryan.barnett@rockwellcollins.com>
> ---
> package/pkg-download.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-29 8:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-26 13:17 [Buildroot] [PATCH 1/1] pkg-download: fix svn download for deleted path Ryan Barnett
2014-06-26 16:30 ` Yann E. MORIN
2014-06-29 8:43 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.