diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-01-28 11:05:39 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-01-28 11:07:49 +0100 |
| commit | 3a7b93a388a06eaea766b13b10faaaa661d22c0d (patch) | |
| tree | 883adadc083fe9ac9028c7c85b8a3616225c83be | |
| parent | 2484007178e3745907d291657fca68d7c6513ca3 (diff) | |
| download | openembedded-3a7b93a388a06eaea766b13b10faaaa661d22c0d.tar.gz | |
git-1.7.3.5: fix git-less-hardlinks.diff and rename files dir to git-1.7.3.5tested_2011-01-28
* otherwise do_install fails with
/bin/sh: -c: line 23: syntax error near unexpected token '||'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes/git/git-1.7.3.5/git-less-hardlinks.diff (renamed from recipes/git/files/git-less-hardlinks.diff) | 3 | ||||
| -rw-r--r-- | recipes/git/git_1.7.3.5.bb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/recipes/git/files/git-less-hardlinks.diff b/recipes/git/git-1.7.3.5/git-less-hardlinks.diff index b1047271f0..ff192502de 100644 --- 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 b377b3d5aa..e17f5a9dac 100644 --- 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 |