[OE-core] [PATCH 07/11] git: Do not install git cvsserver and git svn

[Peter Kjellerstedt]

These git commands require Perl modules that do not exist in OE-Core.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
---
 meta/recipes-devtools/git/git.inc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 9b0d328bad..3ce4642ae7 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -54,6 +54,17 @@ perl_native_fixup () {
 	mkdir -p ${D}${libdir}
 	mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
 	rmdir -p ${D}${exec_prefix}/lib/perl-native || true
+
+	# Remove git cvsserver as it requires the DBI Perl module, which does
+	# not exist in OE-Core.
+	rm ${D}${libexecdir}/git-core/git-cvsserver \
+	   ${D}${bindir}/git-cvsserver
+
+	# Remove git svn and all Git::SVN Perl modules as they require the
+	# SVN::Core Perl module, which does not exist in OE-Core.
+	rm -r ${D}${libexecdir}/git-core/git-svn \
+	      ${D}${libdir}/perl/site_perl/*/Git/SVN*
+	sed -i -e '/SVN/d' ${D}${libdir}/perl/site_perl/*/auto/Git/.packlist
 }
 
 REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
@@ -83,12 +94,9 @@ PERLTOOLS = " \
     ${libexecdir}/git-core/git-archimport \
     ${libexecdir}/git-core/git-cvsexportcommit \
     ${libexecdir}/git-core/git-cvsimport \
-    ${libexecdir}/git-core/git-cvsserver \
-    ${bindir}/git-cvsserver \
     ${libexecdir}/git-core/git-difftool \
     ${libexecdir}/git-core/git-relink \
     ${libexecdir}/git-core/git-send-email \
-    ${libexecdir}/git-core/git-svn \
     ${libexecdir}/git-core/git-instaweb \
     ${libexecdir}/git-core/git-submodule \
     ${libexecdir}/git-core/git-am \
-- 
2.12.0