[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7226/8267] git: Do not install git cvsserver and git svn by default

[Emmanuele Bassi <ebassi src gnome org>]

commit db0980203bf9ef162c904ee64df1817d44c2f94e
Author: Peter Kjellerstedt <pkj axis com>
Date:   Tue Aug 15 16:41:53 2017 -0500

    git: Do not install git cvsserver and git svn by default
    
    These git commands require Perl modules that do not exist in OE-Core.
    Add PACKAGECONFIGs to enable them. Be aware though that if you enable
    them you must also provide the missing dependencies.
    
    (From OE-Core rev: d7909007b2a912ae5adf01edfabaa8b8646369cd)
    
    Signed-off-by: Peter Kjellerstedt <peter kjellerstedt axis com>
    Signed-off-by: Mark Hatle <mark hatle windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/git/git.inc |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 4390b8d..9b4c128 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -13,6 +13,10 @@ S = "${WORKDIR}/git-${PV}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[cvsserver] = ""
+PACKAGECONFIG[svn] = ""
+
 EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
                --without-tcltk \
 "
@@ -54,6 +58,23 @@ 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
+
+       if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then
+               # Only install the git cvsserver command if explicitly requested
+               # 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
+       fi
+
+       if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'svn', d)}" ]; then
+               # Only install the git svn command and all Git::SVN Perl modules
+               # if explicitly requested 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
+       fi
 }
 
 REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"