git-1.7.3.5: fix git-less-hardlinks.diff and rename files dir to git-1.7.3.5

* otherwise do_install fails with
  /bin/sh: -c: line 23: syntax error near unexpected token '||'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/git/files/git-less-hardlinks.diff b/recipes/git/git-1.7.3.5/git-less-hardlinks.diff
similarity index 98%
rename from recipes/git/files/git-less-hardlinks.diff
rename to recipes/git/git-1.7.3.5/git-less-hardlinks.diff
index b104727..ff19250 100644 (file)
--- a/recipes/git/files/git-less-hardlinks.diff
+++ b/recipes/git/git-1.7.3.5/git-less-hardlinks.diff
@@ -35,7 +35,7 @@ Index: git-1.7.3.5/Makefile
        ln -s $< $@ 2>/dev/null || \
        cp $< $@
  
-@@ -2134,20 +2132,18 @@ endif
+@@ -2134,20 +2132,17 @@ endif
        } && \
        for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
                $(RM) "$$bindir/$$p" && \
@@ -53,7 +53,6 @@ Index: git-1.7.3.5/Makefile
        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 && \

diff --git a/recipes/git/git_1.7.3.5.bb b/recipes/git/git_1.7.3.5.bb
index 5b76ca0..b1d18fd 100644 (file)
--- a/recipes/git/git_1.7.3.5.bb
+++ b/recipes/git/git_1.7.3.5.bb
@@ -12,7 +12,7 @@ RDEPENDS_${PN} = "findutils sed"
 RRECOMMENDS_${PN} = "openssh-ssh"
 SRC_URI[src.md5sum] = "8a8cd93b8a4dff0a03c0fdc77253af3e"
 SRC_URI[src.sha256sum] = "41682e4c13b43591b61a96b6f7a549b24863f62dfc4a917b6147c8e708e288a6"
-PR = "r0"
+PR = "r1"
 
 do_install_append() {
        # Fix broken hardlinks