From 3a7b93a388a06eaea766b13b10faaaa661d22c0d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 28 Jan 2011 11:05:39 +0100 Subject: 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 --- recipes/git/files/git-less-hardlinks.diff | 59 ------------------------- recipes/git/git-1.7.3.5/git-less-hardlinks.diff | 58 ++++++++++++++++++++++++ recipes/git/git_1.7.3.5.bb | 2 +- 3 files changed, 59 insertions(+), 60 deletions(-) delete mode 100644 recipes/git/files/git-less-hardlinks.diff create mode 100644 recipes/git/git-1.7.3.5/git-less-hardlinks.diff diff --git a/recipes/git/files/git-less-hardlinks.diff b/recipes/git/files/git-less-hardlinks.diff deleted file mode 100644 index b1047271f0..0000000000 --- a/recipes/git/files/git-less-hardlinks.diff +++ /dev/null @@ -1,59 +0,0 @@ -From: Koen Kooi -Subject: Git: don't use hardlink, try softlinks and fall back to plain 'cp' - -Using hardlinks confuses packaging an ends up giving us a *copy* of the git binary, -making the resulting package 54MB big. This brings it down a more managable 4.4M. - -This patch isn't complete though: - -12cb2bfcde40ce7084ae44af7db88f29 git-cvsserver -2404a2cd2838be3841eac93de40a644e git -2404a2cd2838be3841eac93de40a644e git-receive-pack -2404a2cd2838be3841eac93de40a644e git-upload-archive -61631194968f67e12abd1f80103a2c68 git-upload-pack -7b8faebe64076d65934a05cd60bbeb29 git-shell - ---- - -Index: git-1.7.3.5/Makefile -=================================================================== ---- git-1.7.3.5.orig/Makefile -+++ git-1.7.3.5/Makefile -@@ -1619,7 +1619,6 @@ builtin/help.s builtin/help.o: EXTRA_CPP - - $(BUILT_INS): git$X - $(QUIET_BUILT_IN)$(RM) $@ && \ -- ln git$X $@ 2>/dev/null || \ - ln -s git$X $@ 2>/dev/null || \ - cp git$X $@ - -@@ -1936,7 +1935,6 @@ git-http-push$X: revision.o http.o http- - - $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY) - $(QUIET_LNCP)$(RM) $@ && \ -- ln $< $@ 2>/dev/null || \ - ln -s $< $@ 2>/dev/null || \ - cp $< $@ - -@@ -2134,20 +2132,18 @@ endif - } && \ - for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \ - $(RM) "$$bindir/$$p" && \ -- ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ - ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \ - cp "$$bindir/git$X" "$$bindir/$$p" || exit; \ - done && \ - 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 && \ - 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 && \ diff --git a/recipes/git/git-1.7.3.5/git-less-hardlinks.diff b/recipes/git/git-1.7.3.5/git-less-hardlinks.diff new file mode 100644 index 0000000000..ff192502de --- /dev/null +++ b/recipes/git/git-1.7.3.5/git-less-hardlinks.diff @@ -0,0 +1,58 @@ +From: Koen Kooi +Subject: Git: don't use hardlink, try softlinks and fall back to plain 'cp' + +Using hardlinks confuses packaging an ends up giving us a *copy* of the git binary, +making the resulting package 54MB big. This brings it down a more managable 4.4M. + +This patch isn't complete though: + +12cb2bfcde40ce7084ae44af7db88f29 git-cvsserver +2404a2cd2838be3841eac93de40a644e git +2404a2cd2838be3841eac93de40a644e git-receive-pack +2404a2cd2838be3841eac93de40a644e git-upload-archive +61631194968f67e12abd1f80103a2c68 git-upload-pack +7b8faebe64076d65934a05cd60bbeb29 git-shell + +--- + +Index: git-1.7.3.5/Makefile +=================================================================== +--- git-1.7.3.5.orig/Makefile ++++ git-1.7.3.5/Makefile +@@ -1619,7 +1619,6 @@ builtin/help.s builtin/help.o: EXTRA_CPP + + $(BUILT_INS): git$X + $(QUIET_BUILT_IN)$(RM) $@ && \ +- ln git$X $@ 2>/dev/null || \ + ln -s git$X $@ 2>/dev/null || \ + cp git$X $@ + +@@ -1936,7 +1935,6 @@ git-http-push$X: revision.o http.o http- + + $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY) + $(QUIET_LNCP)$(RM) $@ && \ +- ln $< $@ 2>/dev/null || \ + ln -s $< $@ 2>/dev/null || \ + cp $< $@ + +@@ -2134,20 +2132,17 @@ endif + } && \ + for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \ + $(RM) "$$bindir/$$p" && \ +- ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ + ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \ + cp "$$bindir/git$X" "$$bindir/$$p" || exit; \ + done && \ + 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 && \ + 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 && \ 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 -- cgit 1.2.3-korg