[prev in list] [next in list] [prev in thread] [next in thread] 

List:       buildroot
Subject:    [Buildroot] [PATCH v2 1/1] Allow svn tags and branches notation in $(PKG)_VERSION variable.
From:       Raúl_Sánchez Siles <rasasi78 () gmail ! com>
Date:       2013-09-19 21:54:57
Message-ID: 9954168.3ZbP98P9KY () portaka
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


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 <rasasi78@gmail.com>
---
 docs/manual/adding-packages-generic.txt | 2 ++
 package/pkg-download.mk                 | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

["v2-0001-Allow-svn-tags-and-branches-notation-in-PKG-_VERS.patch" (v2-0001-Allow-svn-tags-and-branches-notation-in-PKG-_VERS.patch)]

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)

["signature.asc" (application/pgp-signature)]

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

[prev in list] [next in list] [prev in thread] [next in thread]