git: expand recipe to take advantage of pre-gen'd manpages

These could be created from scratch from git itself, but it
requires asciidoc, xsltproc, python bits and too much other
baggage.  Since the git folks issue a tarball with the manpages
for each release, it is simpler to just go get that.

(From OE-Core rev: 9aba4bf2143c228d58aac06764f87ace5dd21d02)

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 13 insertions, 3 deletions

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 5396628790..ace1790a02 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -5,7 +5,9 @@ DEPENDS = "openssl curl zlib expat"
 
 PROVIDES_append_class-native = " git-replacement-native"
 
-SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz"
+SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \
+           ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages"
+
 S = "${WORKDIR}/git-${PV}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
@@ -30,6 +32,12 @@ do_install () {
         oe_runmake install DESTDIR="${D}" bindir=${bindir} \
                 template_dir=${datadir}/git-core/templates \
                 GIT_PYTHON_DIR=${D}${datadir}/git-core/python
+        install -d ${D}/${mandir}/man1
+        install -d ${D}/${mandir}/man5
+        install -d ${D}/${mandir}/man7
+        install -t ${D}/${mandir}/man1 ${WORKDIR}/man1/*
+        install -t ${D}/${mandir}/man5 ${WORKDIR}/man5/*
+        install -t ${D}/${mandir}/man7 ${WORKDIR}/man7/*
 }
 
 perl_native_fixup () {
diff --git a/meta/recipes-devtools/git/git_2.2.1.bb b/meta/recipes-devtools/git/git_2.2.1.bb
index 2d47cda775..d1fcb27587 100644
--- a/meta/recipes-devtools/git/git_2.2.1.bb
+++ b/meta/recipes-devtools/git/git_2.2.1.bb
@@ -1,7 +1,9 @@
 require git.inc
 
-SRC_URI[md5sum] = "ff41fdb094eed1ec430aed8ee9b9849c"
-SRC_URI[sha256sum] = "367a77d0b10a5070b02a0fb0e942f26f25af61793128e0ddfd5c5c474de93589"
+SRC_URI[tarball.md5sum] = "ff41fdb094eed1ec430aed8ee9b9849c"
+SRC_URI[tarball.sha256sum] = "367a77d0b10a5070b02a0fb0e942f26f25af61793128e0ddfd5c5c474de93589"
+SRC_URI[manpages.md5sum] = "b5ddd262b608804ba4403f0f82d881d7"
+SRC_URI[manpages.sha256sum] = "69dcb3decdb33dd35491935e80f71c40c576b536df4223eb98d5f7ccd9643293"
 
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
                  ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \