summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2017-08-15 16:41:53 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-17 00:21:14 +0100
commitdb0980203bf9ef162c904ee64df1817d44c2f94e (patch)
tree020b4258a01910e252d8603d86910f32e8284601
parenta38ca789cfbe860cdea37fb86751db2b176f4e25 (diff)
downloadpoky-db0980203bf9ef162c904ee64df1817d44c2f94e.tar.gz
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>
-rw-r--r--meta/recipes-devtools/git/git.inc21
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 4390b8d6f5..9b4c1284d2 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -13,6 +13,10 @@ S = "${WORKDIR}/git-${PV}"
13 13
14LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1" 14LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
15 15
16PACKAGECONFIG ??= ""
17PACKAGECONFIG[cvsserver] = ""
18PACKAGECONFIG[svn] = ""
19
16EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ 20EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
17 --without-tcltk \ 21 --without-tcltk \
18" 22"
@@ -54,6 +58,23 @@ perl_native_fixup () {
54 mkdir -p ${D}${libdir} 58 mkdir -p ${D}${libdir}
55 mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir} 59 mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
56 rmdir -p ${D}${exec_prefix}/lib/perl-native || true 60 rmdir -p ${D}${exec_prefix}/lib/perl-native || true
61
62 if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then
63 # Only install the git cvsserver command if explicitly requested
64 # as it requires the DBI Perl module, which does not exist in
65 # OE-Core.
66 rm ${D}${libexecdir}/git-core/git-cvsserver \
67 ${D}${bindir}/git-cvsserver
68 fi
69
70 if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'svn', d)}" ]; then
71 # Only install the git svn command and all Git::SVN Perl modules
72 # if explicitly requested as they require the SVN::Core Perl
73 # module, which does not exist in OE-Core.
74 rm -r ${D}${libexecdir}/git-core/git-svn \
75 ${D}${libdir}/perl/site_perl/*/Git/SVN*
76 sed -i -e '/SVN/d' ${D}${libdir}/perl/site_perl/*/auto/Git/.packlist
77 fi
57} 78}
58 79
59REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core" 80REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"