From: Yann Dirson <ydirson@altern.org>
Date: Wed, 15 Sep 2010 11:27:46 +0000 (+0000)
Subject: git: replace remaining broken hardlinks with symlinks.
X-Git-Tag: sz_173~148
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=336a80db4f40733d64b28fbcaa0d9704c9147ea6;p=openembedded.git

git: replace remaining broken hardlinks with symlinks.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

Conflicts:

	recipes/git/git_1.7.0.2.bb
---

diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
index 7bf9e89986..8ecc12a13b 100644
--- a/recipes/git/git_1.7.0.2.bb
+++ b/recipes/git/git_1.7.0.2.bb
@@ -14,14 +14,18 @@ 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"
+PR = "r8"
 
 do_install_append() {
 	# Fix broken hardlinks
 	for gitprog in git-receive-pack git-upload-archive ; do
-		rm ${D}${bindir}/$gitprog 
+		rm ${D}${bindir}/$gitprog
 		ln -sf ${bindir}/git ${D}${bindir}/$gitprog
 	done
+	for gitprog in git-cvsserver git-shell git-upload-pack ; do
+		rm ${D}${libexecdir}/git-core/$gitprog
+		ln -sf ${bindir}/$gitprog ${D}${libexecdir}/git-core/$gitprog
+	done
 	rm ${D}${libexecdir}/git-core/git && ln -sf ${bindir}/git ${D}${libexecdir}/git-core/git
 }