--===============4122580500592844826== Content-Type: multipart/signed; boundary="nextPart2519091.1ZELLx9UFd"; micalg="pgp-sha1"; protocol="application/pgp-signature" --nextPart2519091.1ZELLx9UFd Content-Type: multipart/mixed; boundary="nextPart12025551.j0yIDGG0S3" Content-Transfer-Encoding: 7Bit This is a multi-part message in MIME format. --nextPart12025551.j0yIDGG0S3 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" According to user manual "generic-package Reference" section, LIBFOO_VE= RSION could refer to a branch or tag. This patch adds supports for this in th= e svn method case for the repositories following the branches/tags/trunk layo= ut. Examples: LIBFOO_VERSION =3D tags/v3.2.1 LIBFOO_SITE =3D svn://svn.server.net/myproject LIBFOO2_VERSION =3D branches/featureA LIBFOO2_SITE =3D http://svn.happyserver.net/theproject LIBFOO2_SITE_METHOD =3D svn Signed-off-by: Ra=C3=BAl S=C3=A1nchez Siles --- docs/manual/adding-packages-generic.txt | 2 ++ package/pkg-download.mk | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) --nextPart12025551.j0yIDGG0S3 Content-Disposition: inline; filename="v2-0001-Allow-svn-tags-and-branches-notation-in-PKG-_VERS.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="utf-8"; name="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) --nextPart12025551.j0yIDGG0S3-- --nextPart2519091.1ZELLx9UFd Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (GNU/Linux) iQEcBAABAgAGBQJSO3KxAAoJEFFWFxAwbQeW1YAIAL5qwGuiq3RACRWNJ+KOUWub 1kZCHPSgkMMv7Mh0tzjWrDttHowhnYkvgTPl0qikAZBu5iEwcHdLHZ6KZq3AbVGQ EYaSIo/2ZbNts0dnoNkjis/RuHMhp0l/PQLAZSdsKAvmLbjhLFgTTbe3Iziv9ChF u44Nc8kkIwlcKZ4Gn1LSl7NBUgD+7VtNB08EdTxb5nLiyEnQwSZFPwUqVuSGDHCT MpcVc2IlZqhRP6uLetmzYoGfVhlK30YIwpK4lOkm5tM52y4ao804snxtzw4mgP1d SIwAxOnDyojiNtzQXoBrDO6jocfckrn9DHOd6tyKpAauOZVxayxOdBZXyAmdqLQ= =QYsY -----END PGP SIGNATURE----- --nextPart2519091.1ZELLx9UFd-- --===============4122580500592844826== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ buildroot mailing list buildroot@busybox.net http://lists.busybox.net/mailman/listinfo/buildroot --===============4122580500592844826==--