On Sat, Feb 27, 2016 at 01:32:52AM +0000, Karl Palsson wrote:
> This changes the buildroot dependency from git-1.6.2 to git 1.7.12.2,
> which was released September 2012.

I find this annoying, since Debian wheezy only has git 1.7.10.4.
Actually, sometimes I use a squeeze box for building, and it works
perfectly fine.

> Signed-off-by: Darik Horn <dajh...@vanadac.com>
> Signed-off-by: Karl Palsson <ka...@tweak.net.au>
> ---
>  include/download.mk     | 5 +++--
>  include/prereq-build.mk | 4 ++--
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> 
> Note: this does NOT help with CONFIG_SRC_TREE_OVERRIDE=y!
> 
> diff --git a/include/download.mk b/include/download.mk
> index 8619734..a118aad 100644
> --- a/include/download.mk
> +++ b/include/download.mk
> @@ -90,8 +90,9 @@ define DownloadMethod/git
>               cd $(TMP_DIR)/dl && \
>               rm -rf $(SUBDIR) && \
>               [ \! -d $(SUBDIR) ] && \
> -             git clone $(URL) $(SUBDIR) --recursive && \
> -             (cd $(SUBDIR) && git checkout $(VERSION) && git submodule 
> update) && \
> +             git clone $(URL) $(SUBDIR) && \
> +             (cd $(SUBDIR) && git checkout $(VERSION) && \
> +             git submodule update --init --recursive) && \
>               echo "Packing checkout..." && \
>               rm -rf $(SUBDIR)/.git && \
>               $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
> diff --git a/include/prereq-build.mk b/include/prereq-build.mk
> index bcb2103..23a5b93 100644
> --- a/include/prereq-build.mk
> +++ b/include/prereq-build.mk
> @@ -154,8 +154,8 @@ $(eval $(call SetupHostCommand,python,Please install 
> Python 2.x, \
>  $(eval $(call SetupHostCommand,svn,Please install the Subversion client, \
>       svn --version | grep Subversion))
>  
> -$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.6.5, \
> -     git clone 2>&1 | grep -- --recursive))
> +$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 
> 1.7.12.2, \
> +     git submodule update --help 2>&1 | grep -- --recursive))
>  
>  $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
>       file --version 2>&1 | grep file))

Attachment: signature.asc
Description: PGP signature

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to