[oe] [PATCH 3/4] git: add 1.7.2.1

[Paul Menzel]

Dear Bernhard,


Am Freitag, den 06.08.2010, 11:40 +0200 schrieb Bernhard Reutner-Fischer:
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>

[…]

> diff --git a/recipes/git/files/git-less-hardlinks.diff b/recipes/git/files/git-less-hardlinks.diff
> index 183fe8f..be4924c 100644
> --- a/recipes/git/files/git-less-hardlinks.diff
> +++ b/recipes/git/files/git-less-hardlinks.diff
> @@ -33,17 +33,18 @@ This patch isn't complete though:
>   	ln -s $< $@ 2>/dev/null || \
>   	cp $< $@
>   
> -@@ -1830,13 +1828,11 @@
> +@@ -2081,14 +2081,12 @@
>   		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
> - 	{ for p in $(BUILT_INS); do \
> + 	for p in $(BUILT_INS); do \
>   		$(RM) "$$execdir/$$p" && \
>  -		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
>   		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
>   		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
> - 	  done; } && \
> - 	{ for p in $(REMOTE_CURL_ALIASES); do \
> + 	done && \
> + 	remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
> + 	for p in $$remote_curl_aliases; do \
>   		$(RM) "$$execdir/$$p" && \
>  -		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
>   		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
>   		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
> - 	  done; } && \
> + 	done && \

did you take Yann’s patches into consideration [1].

> diff --git a/recipes/git/git-native_1.7.0.2.bb b/recipes/git/git-native_1.7.0.2.bb
> deleted file mode 100644
> index b55070a..0000000
> --- a/recipes/git/git-native_1.7.0.2.bb
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -require git.inc
> -inherit native
> -DEPENDS = "openssl-native curl-native zlib-native expat-native"
> -PR = "r4"
> -SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
> -SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
> -
> -EXTRA_OECONF_append = " --without-python"
> diff --git a/recipes/git/git.inc b/recipes/git/git.inc
> index 8275adb..1e69682 100644
> --- a/recipes/git/git.inc
> +++ b/recipes/git/git.inc
> @@ -4,8 +4,6 @@ LICENSE = "GPL"
>  
>  SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2;name=src"
>  
> -S = "${WORKDIR}/git-${PV}"
> -
>  inherit autotools
>  
>  EXTRA_OEMAKE = "NO_TCLTK=1"
> diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
> deleted file mode 100644
> index a3a73f0..0000000
> --- a/recipes/git/git_1.7.0.2.bb
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -require git.inc
> -
> -SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
> -SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
> -
> -SRC_URI += "file://git-less-hardlinks.diff"
> -
> -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
> -
> -
> -DEPENDS = "openssl curl zlib expat"
> -RDEPENDS_${PN} = "perl perl-module-file-path cpio findutils sed"
> -
> -# Dropbear ssh needs a wrapper script, so install openssh-ssh to make it work out of the box
> -RRECOMMENDS_${PN} = "openssh-ssh"
> -
> -PR = "r6"
> -
> -do_install_append() {
> -	# Fix broken hardlinks
> -	for gitprog in git-receive-pack git-upload-archive ; do
> -		rm ${D}${bindir}/$gitprog 
> -		ln -sf ${bindir}/git ${D}${bindir}/$gitprog
> -	done
> -	rm ${D}${libexecdir}/git-core/git && ln -sf ${bindir}/git ${D}${libexecdir}/git-core/git
> -}
> -
> -FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
> diff --git a/recipes/git/git_1.7.2.1.bb b/recipes/git/git_1.7.2.1.bb
> new file mode 100644
> index 0000000..4e07d86
> --- /dev/null
> +++ b/recipes/git/git_1.7.2.1.bb
> @@ -0,0 +1,29 @@
> +require git.inc
> +
> +SRC_URI[src.md5sum] = "24a443a120a0ab372185cb6bc0dbd934"
> +SRC_URI[src.sha256sum] = "5446b4ece3b8d81b1fcbcd6c4b91f1961b6f4047a3f6173e3200bee368724921"
> +
> +SRC_URI += "file://git-less-hardlinks.diff"
> +BBCLASSEXTEND = "native"
> +
> +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
> +EXTRA_OECONF_append-native = " --without-python"
> +
> +DEPENDS = "openssl curl zlib expat"
> +RDEPENDS_${PN} = "perl perl-module-file-path cpio findutils sed"
> +
> +# Dropbear ssh needs a wrapper script, so install openssh-ssh to make it work out of the box
> +RRECOMMENDS_${PN} = "openssh-ssh"
> +
> +PR = "r0"
> +
> +do_install_append() {
> +	# Fix broken hardlinks
> +	#for gitprog in git-receive-pack git-upload-archive ; do
> +	#	rm ${D}${bindir}/$gitprog 
> +	#	ln -sf ${bindir}/git ${D}${bindir}/$gitprog
> +	#done
> +	#rm ${D}${libexecdir}/git-core/git && ln -sf ${bindir}/git ${D}${libexecdir}/git-core/git
> +}

Can this be removed?

> +FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"

It would be great if you could comment the changes in the commit
message.


Thanks,

Paul


[1] http://patchwork.openembedded.org/patch/2543/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20100806/372f3fa2/attachment-0002.sig>