[Buildroot] [PATCH] pkg-download with git and not VERSION set in package

[Buildroot] [PATCH] pkg-download with git and not VERSION set in package

[Patrick Boettcher]

I'm new to buildroot and was playing with a local git-tree. I noticed
that things weren't working when VERSION is not set in the package.

The following patch is trivial but solves the problem with the current
implemenation.

Please copy me on replies as I'm not yet subscribed.

Patrick Boettcher (1):
  pkg-download: take some more care of <PKG_>VERSION when METHOD is git

 package/pkg-download.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
1.7.10.4

[Buildroot] [PATCH] pkg-download: take some more care of <PKG_>VERSION when METHOD is git

[Patrick Boettcher]

If a package's SITE_METHOD is set to git, but the VERSION is not set
it fails to create a tar-ball, this patch is fixes this by always using
HEAD as git-archive reference.

HEAD will work in both cases:
1) if VERSION is set the clone's HEAD is VERSION,
2) if VERSION is not set the clone's HEAD is the default branch.

Signed-off-by: Patrick Boettcher <Patrick.Boettcher@parrot.com>
---
 package/pkg-download.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 1705fcd..d21605a 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -88,7 +88,7 @@ define DOWNLOAD_GIT
 	  (echo "Doing full clone" && \
 	   $(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME))) && \
 	pushd $($(PKG)_BASE_NAME) > /dev/null && \
-	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ $($(PKG)_DL_VERSION) | \
+	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ HEAD | \
 		gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \
 	popd > /dev/null && \
 	rm -rf $($(PKG)_DL_DIR) && \
-- 
1.7.10.4

[Buildroot] [PATCH] pkg-download: take some more care of <PKG_>VERSION when METHOD is git

[Arnout Vandecappelle]

On 29/03/13 15:07, Patrick Boettcher wrote:
> If a package's SITE_METHOD is set to git, but the VERSION is not set
> it fails to create a tar-ball, this patch is fixes this by always using
> HEAD as git-archive reference.
>
> HEAD will work in both cases:
> 1) if VERSION is set the clone's HEAD is VERSION,
> 2) if VERSION is not set the clone's HEAD is the default branch.

  This doesn't work if the version is an unnamed sha1. In that case, a 
full clone will be done so HEAD does not point to the requested version.

  A better solution is probably to have <PKG>_VERSION default to HEAD if 
the site-method is one of the revision control systems.


  Regards,
  Arnout

>
> Signed-off-by: Patrick Boettcher <Patrick.Boettcher@parrot.com>
> ---
>   package/pkg-download.mk |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index 1705fcd..d21605a 100644
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -88,7 +88,7 @@ define DOWNLOAD_GIT
>   	  (echo "Doing full clone" && \
>   	   $(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME))) && \
>   	pushd $($(PKG)_BASE_NAME) > /dev/null && \
> -	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ $($(PKG)_DL_VERSION) | \
> +	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ HEAD | \
>   		gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \
>   	popd > /dev/null && \
>   	rm -rf $($(PKG)_DL_DIR) && \
>


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH v2] pkg-download: take some more care of <PKG_>VERSION with git

[Patrick Boettcher]

This replaces the one-liner patch I made last week after a comment by
Thomas De Schampheleire. (it is now a 5-liner)

I added comment to explain why using HEAD is better in the current
situation. I did not change the hg-part as it is different to git -
after a quick read it won't work at all when VERSION is not set in a
packge.

Please apply if appropriate and helpful (it is for me).

Patrick Boettcher (1):
  pkg-download: take some more care of <PKG_>VERSION when METHOD is git

 package/pkg-download.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--
1.7.10.4

[Buildroot] [PATCH] pkg-download: take some more care of <PKG_>VERSION when METHOD is git

[Patrick Boettcher]

If a package's SITE_METHOD is set to git, but the VERSION is not set
it fails to create a tar-ball, this patch is fixes this by always using
HEAD as git-archive reference.

HEAD will work in both cases:
1) if VERSION is set the clone's HEAD is VERSION,
2) if VERSION is not set the clone's HEAD is the default branch.

Signed-off-by: Patrick Boettcher <Patrick.Boettcher@parrot.com>
---
 package/pkg-download.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 1705fcd..610ceb3 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -77,6 +77,10 @@ domainseparator=$(if $(1),$(1),/)
 # branch). Before trying to do a shallow clone we check if $($(PKG)_DL_VERSION)
 # is in the list provided by git ls-remote. If not we fall back on a full clone.
 #
+# In any case we archive HEAD (and not $($(PKG)_DL_VERSION)): if VERSION is not
+# set the default branch is checked out and git-archive will fail if no refspec
+# is given. HEAD will continue to work if VERSION is set.
+#
 # Messages for the type of clone used are provided to ease debugging in case of
 # problems
 define DOWNLOAD_GIT
@@ -88,7 +92,7 @@ define DOWNLOAD_GIT
 	  (echo "Doing full clone" && \
 	   $(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME))) && \
 	pushd $($(PKG)_BASE_NAME) > /dev/null && \
-	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ $($(PKG)_DL_VERSION) | \
+	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ HEAD | \
 		gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \
 	popd > /dev/null && \
 	rm -rf $($(PKG)_DL_DIR) && \
-- 
1.7.10.4