* [PATCH v2 1/2] Makefile: update GIT_VER to use v1.7.12.4
@ 2013-03-04 13:26 mailings
2013-03-04 13:26 ` [PATCH v2 2/2] Makefile: get the git version from the submodule mailings
2013-03-04 14:20 ` [PATCH v2 1/2] Makefile: update GIT_VER to use v1.7.12.4 Jason
0 siblings, 2 replies; 9+ messages in thread
From: mailings @ 2013-03-04 13:26 UTC (permalink / raw)
From: Ferry Huberts <ferry.huberts at pelagic.nl>
It fixes the build when using the 'get-git' target instead
of using the git submodule.
This was forgotten in 7f4e8c3.
Signed-off-by: Ferry Huberts <ferry.huberts at pelagic.nl>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 76f6fe7..118a2c9 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.4
+GIT_VER = 1.7.12.4
GIT_URL = https://github.com/git/git/archive/v$(GIT_VER).tar.gz
INSTALL = install
MAN5_TXT = $(wildcard *.5.txt)
--
1.7.11.7
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] Makefile: get the git version from the submodule
2013-03-04 13:26 [PATCH v2 1/2] Makefile: update GIT_VER to use v1.7.12.4 mailings
@ 2013-03-04 13:26 ` mailings
2013-03-04 13:34 ` john
` (2 more replies)
2013-03-04 14:20 ` [PATCH v2 1/2] Makefile: update GIT_VER to use v1.7.12.4 Jason
1 sibling, 3 replies; 9+ messages in thread
From: mailings @ 2013-03-04 13:26 UTC (permalink / raw)
From: Ferry Huberts <ferry.huberts at pelagic.nl>
No more need to update Makefile when we switch git versions
Signed-off-by: Ferry Huberts <ferry.huberts at pelagic.nl>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 118a2c9..6d834ed 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.12.4
-GIT_URL = https://github.com/git/git/archive/v$(GIT_VER).tar.gz
+GIT_VER = $(shell git submodule status git | sed -r 's/^[^0-9a-fA-F]*([0-9a-fA-F]*).*/\1/')
+GIT_URL = https://github.com/git/git/archive/$(GIT_VER).tar.gz
INSTALL = install
MAN5_TXT = $(wildcard *.5.txt)
MAN_TXT = $(MAN5_TXT)
--
1.7.11.7
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] Makefile: get the git version from the submodule
2013-03-04 13:26 ` [PATCH v2 2/2] Makefile: get the git version from the submodule mailings
@ 2013-03-04 13:34 ` john
2013-03-04 14:26 ` Jason
2013-03-04 13:38 ` hjemli
2013-03-04 14:22 ` Jason
2 siblings, 1 reply; 9+ messages in thread
From: john @ 2013-03-04 13:34 UTC (permalink / raw)
On Mon, Mar 04, 2013 at 02:26:38PM +0100, Ferry Huberts wrote:
> From: Ferry Huberts <ferry.huberts at pelagic.nl>
>
> No more need to update Makefile when we switch git versions
Thanks for fixing my omission with the version number. I don't think
this patch is a good idea though - the whole point of GIT_VER (and the
get-git target that uses it) is to download a suitable version of Git
without needing to have git available. If we change GIT_VER to rely on
the submodule existing then we might as well delete it entirely.
I do wonder if we should change GIT_URL to point at:
https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
since that's the URL in the Git release note.
> Signed-off-by: Ferry Huberts <ferry.huberts at pelagic.nl>
> ---
> Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 118a2c9..6d834ed 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,8 +14,8 @@ htmldir = $(docdir)
> pdfdir = $(docdir)
> mandir = $(prefix)/share/man
> SHA1_HEADER = <openssl/sha.h>
> -GIT_VER = 1.7.12.4
> -GIT_URL = https://github.com/git/git/archive/v$(GIT_VER).tar.gz
> +GIT_VER = $(shell git submodule status git | sed -r 's/^[^0-9a-fA-F]*([0-9a-fA-F]*).*/\1/')
> +GIT_URL = https://github.com/git/git/archive/$(GIT_VER).tar.gz
> INSTALL = install
> MAN5_TXT = $(wildcard *.5.txt)
> MAN_TXT = $(MAN5_TXT)
> --
> 1.7.11.7
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] Makefile: get the git version from the submodule
2013-03-04 13:26 ` [PATCH v2 2/2] Makefile: get the git version from the submodule mailings
2013-03-04 13:34 ` john
@ 2013-03-04 13:38 ` hjemli
2013-03-04 13:49 ` mailings
2013-03-04 14:22 ` Jason
2 siblings, 1 reply; 9+ messages in thread
From: hjemli @ 2013-03-04 13:38 UTC (permalink / raw)
On Mon, Mar 4, 2013 at 2:26 PM, Ferry Huberts <mailings at hupie.com> wrote:
> diff --git a/Makefile b/Makefile
> index 118a2c9..6d834ed 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,8 +14,8 @@ htmldir = $(docdir)
> pdfdir = $(docdir)
> mandir = $(prefix)/share/man
> SHA1_HEADER = <openssl/sha.h>
> -GIT_VER = 1.7.12.4
> -GIT_URL = https://github.com/git/git/archive/v$(GIT_VER).tar.gz
> +GIT_VER = $(shell git submodule status git | sed -r 's/^[^0-9a-fA-F]*([0-9a-fA-F]*).*/\1/')
> +GIT_URL = https://github.com/git/git/archive/$(GIT_VER).tar.gz
Please don't do this - the GIT_URL is used when building from a cgit
tarball, in which case `git submodule` wlll fail...
--
larsh
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] Makefile: get the git version from the submodule
2013-03-04 13:38 ` hjemli
@ 2013-03-04 13:49 ` mailings
2013-03-04 13:56 ` hjemli
0 siblings, 1 reply; 9+ messages in thread
From: mailings @ 2013-03-04 13:49 UTC (permalink / raw)
On 04/03/13 14:38, Lars Hjemli wrote:
> On Mon, Mar 4, 2013 at 2:26 PM, Ferry Huberts <mailings at hupie.com> wrote:
>> diff --git a/Makefile b/Makefile
>> index 118a2c9..6d834ed 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -14,8 +14,8 @@ htmldir = $(docdir)
>> pdfdir = $(docdir)
>> mandir = $(prefix)/share/man
>> SHA1_HEADER = <openssl/sha.h>
>> -GIT_VER = 1.7.12.4
>> -GIT_URL = https://github.com/git/git/archive/v$(GIT_VER).tar.gz
>> +GIT_VER = $(shell git submodule status git | sed -r 's/^[^0-9a-fA-F]*([0-9a-fA-F]*).*/\1/')
>> +GIT_URL = https://github.com/git/git/archive/$(GIT_VER).tar.gz
>
> Please don't do this - the GIT_URL is used when building from a cgit
> tarball, in which case `git submodule` wlll fail...
>
no problem, now we just need a reminder somewhere that the makefile also
has to be updated ;-)
--
Ferry Huberts
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] Makefile: get the git version from the submodule
2013-03-04 13:49 ` mailings
@ 2013-03-04 13:56 ` hjemli
0 siblings, 0 replies; 9+ messages in thread
From: hjemli @ 2013-03-04 13:56 UTC (permalink / raw)
On Mon, Mar 4, 2013 at 2:49 PM, Ferry Huberts <mailings at hupie.com> wrote:
>
> On 04/03/13 14:38, Lars Hjemli wrote:
>>
>> On Mon, Mar 4, 2013 at 2:26 PM, Ferry Huberts <mailings at hupie.com> wrote:
>>>
>>> diff --git a/Makefile b/Makefile
>>> index 118a2c9..6d834ed 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -14,8 +14,8 @@ htmldir = $(docdir)
>>> pdfdir = $(docdir)
>>> mandir = $(prefix)/share/man
>>> SHA1_HEADER = <openssl/sha.h>
>>> -GIT_VER = 1.7.12.4
>>> -GIT_URL = https://github.com/git/git/archive/v$(GIT_VER).tar.gz
>>> +GIT_VER = $(shell git submodule status git | sed -r
>>> 's/^[^0-9a-fA-F]*([0-9a-fA-F]*).*/\1/')
>>> +GIT_URL = https://github.com/git/git/archive/$(GIT_VER).tar.gz
>>
>>
>> Please don't do this - the GIT_URL is used when building from a cgit
>> tarball, in which case `git submodule` wlll fail...
>>
>
> no problem, now we just need a reminder somewhere that the makefile also has
> to be updated ;-)
Yeah, a patch for 'make test' to catch this would be nice.
--
larsh
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 1/2] Makefile: update GIT_VER to use v1.7.12.4
2013-03-04 13:26 [PATCH v2 1/2] Makefile: update GIT_VER to use v1.7.12.4 mailings
2013-03-04 13:26 ` [PATCH v2 2/2] Makefile: get the git version from the submodule mailings
@ 2013-03-04 14:20 ` Jason
1 sibling, 0 replies; 9+ messages in thread
From: Jason @ 2013-03-04 14:20 UTC (permalink / raw)
On Mon, Mar 4, 2013 at 8:26 AM, Ferry Huberts <mailings at hupie.com> wrote:
> From: Ferry Huberts <ferry.huberts at pelagic.nl>
>
> It fixes the build when using the 'get-git' target instead
> of using the git submodule.
>
> This was forgotten in 7f4e8c3.
Good catch, thanks. Fixed up.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] Makefile: get the git version from the submodule
2013-03-04 13:26 ` [PATCH v2 2/2] Makefile: get the git version from the submodule mailings
2013-03-04 13:34 ` john
2013-03-04 13:38 ` hjemli
@ 2013-03-04 14:22 ` Jason
2 siblings, 0 replies; 9+ messages in thread
From: Jason @ 2013-03-04 14:22 UTC (permalink / raw)
On Mon, Mar 4, 2013 at 8:26 AM, Ferry Huberts <mailings at hupie.com> wrote:
> +GIT_VER = $(shell git submodule status git | sed -r 's/^[^0-9a-fA-F]*([0-9a-fA-F]*).*/\1/')
Neat idea, but I'd rather not have the git circularity.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] Makefile: get the git version from the submodule
2013-03-04 13:34 ` john
@ 2013-03-04 14:26 ` Jason
0 siblings, 0 replies; 9+ messages in thread
From: Jason @ 2013-03-04 14:26 UTC (permalink / raw)
On Mon, Mar 4, 2013 at 8:34 AM, John Keeping <john at keeping.me.uk> wrote:
> I do wonder if we should change GIT_URL to point at:
>
> https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
>
> since that's the URL in the Git release note.
It's also where git-scm.com links. I made the change as a fixup.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-03-04 14:26 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-04 13:26 [PATCH v2 1/2] Makefile: update GIT_VER to use v1.7.12.4 mailings
2013-03-04 13:26 ` [PATCH v2 2/2] Makefile: get the git version from the submodule mailings
2013-03-04 13:34 ` john
2013-03-04 14:26 ` Jason
2013-03-04 13:38 ` hjemli
2013-03-04 13:49 ` mailings
2013-03-04 13:56 ` hjemli
2013-03-04 14:22 ` Jason
2013-03-04 14:20 ` [PATCH v2 1/2] Makefile: update GIT_VER to use v1.7.12.4 Jason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).