Date: Wed, 4 Aug 2010 00:50:27 +0200
From: Yann Dirson <ydirson@free.fr>
To: openembedded-devel@lists.openembedded.org
Message-ID: <20100803225027.GH4752@home.lan>
MIME-Version: 1.0
In-Reply-To: <1280792514-24843-2-git-send-email-ydirson@altern.org>
User-Agent: Mutt/1.5.20 (2009-06-14)
Subject: [PATCH 2/3] git: split space-hungry rarely-used commands into -perltools and -large packages.
Precedence: list
Reply-To: openembedded-devel@lists.openembedded.org
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

This trims the main package by ~75%, and split of all perl scripts allows
to spare the installation of perl, which is no small bargain either.

Note that git-remote-http triggers a strange bug (OE#5465), so it is not
split out for now.

Also drop cpio dependency, which has been unneeded since a number of git
revisions.

Tested rapidly on shr/testing: seen no problem doing clone/commit/amend/reset/
revert/log/status/diff/rebase -i/conflict resolution.

Signed-off-by: Yann Dirson <ydirson@altern.org>
---
 recipes/git/git_1.7.0.2.bb |   46 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
index 917b609..4973f05 100644
--- a/recipes/git/git_1.7.0.2.bb
+++ b/recipes/git/git_1.7.0.2.bb
@@ -9,12 +9,12 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
 
 
 DEPENDS = "openssl curl zlib expat"
-RDEPENDS_${PN} = "perl perl-module-file-path cpio findutils sed"
+RDEPENDS_${PN} = "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.1"
+PR = "r6.2"
 
 do_install_append() {
 	# Fix broken hardlinks
@@ -30,3 +30,45 @@ do_install_append() {
 }
 
 FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
+
+PACKAGES =+ "${PN}-perltools"
+FILES_${PN}-perltools += " \
+	/usr/libexec/git-core/add--interactive \
+	/usr/libexec/git-core/git-archimport \
+	/usr/libexec/git-core/git-cvsexportcommit \
+	/usr/libexec/git-core/git-cvsimport \
+	/usr/libexec/git-core/git-cvsserver \
+	/usr/bin/git-cvsserver \
+	/usr/libexec/git-core/git-difftool \
+	/usr/libexec/git-core/git-relink \
+	/usr/libexec/git-core/git-send-email \
+	/usr/libexec/git-core/git-svn \
+	/usr/share/perl \
+"
+RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"
+
+PACKAGES =+ "${PN}-large"
+FILES_${PN}-large += " \
+	/usr/libexec/git-core/git-http-backend \
+	/usr/libexec/git-core/git-daemon \
+	/usr/libexec/git-core/git-http-push \
+	/usr/libexec/git-core/git-quiltimport \
+	/usr/libexec/git-core/git-request-pull \
+	/usr/libexec/git-core/git-shell \
+	/usr/bin/git-shell \
+	/usr/libexec/git-core/git-instaweb \
+	/usr/libexec/git-core/git-fast-import \
+	/usr/libexec/git-core/git-imap-send \
+"
+# those might be useful in a less-than-large package ?
+FILES_${PN}-large += " \
+	/usr/libexec/git-core/git-http-fetch \
+	/usr/libexec/git-core/git-upload-pack \
+	/usr/bin/git-upload-pack \
+"
+# same here, but adding it causes git to depend on git-large(!)
+# see http://bugs.openembedded.net/show_bug.cgi?id=5465
+#FILES_${PN}-large += " \
+#	/usr/libexec/git-core/git-remote-http \
+#"
+RDEPENDS_${PN}-large = "${PN}"
-- 
1.7.1