Skip to content

Commit

Permalink
git-1.7.3.5: fix git-less-hardlinks.diff and rename files dir to git-…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
shr-project committed Jan 28, 2011
1 parent 2484007 commit 3a7b93a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
Expand Up @@ -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" && \
Expand All @@ -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 && \
2 changes: 1 addition & 1 deletion recipes/git/git_1.7.3.5.bb
Expand Up @@ -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
Expand Down

0 comments on commit 3a7b93a

Please sign in to comment.