diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-04-30 10:21:15 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-09 14:08:59 +0100 |
commit | b8124c47113ab3471fa624cc10b33abbd9719595 (patch) | |
tree | 291a5daa15bbfc79fc54551ef495861a4ba0d582 | |
parent | 2fcf5a7706de1431bbc1d6ef981360bb4ec0c028 (diff) | |
download | poky-b8124c47113ab3471fa624cc10b33abbd9719595.tar.gz |
git: make it work on the target
Packaging is synced with OE .dev, but without the -large, thanks to pseudo we retain all (hard)links properly:
* git-perltools holds all the utils requiring perl and adds appropriate RDEPENDS
* git-tk holds the tcl/tk utils once they get activate
* git now packages /usr/libexec/git-core
The result:
8.5M ipk/armv7a/git_1.7.4.3-r2_armv7a.ipk
3.1M ipk/armv7a/git-dbg_1.7.4.3-r2_armv7a.ipk
4.0K ipk/armv7a/git-dev_1.7.4.3-r2_armv7a.ipk
12K ipk/armv7a/git-doc_1.7.4.3-r2_armv7a.ipk
136K ipk/armv7a/git-perltools_1.7.4.3-r2_armv7a.ipk
(From OE-Core rev: 56aa79cda92479466dbf4657ca9ea35212b88cf6)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/git/git.inc | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/git/git_1.7.4.3.bb | 2 |
2 files changed, 31 insertions, 3 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 843a1d3511..7f12859792 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc | |||
@@ -14,11 +14,39 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl --without-tcltk" | |||
14 | inherit autotools | 14 | inherit autotools |
15 | 15 | ||
16 | do_install () { | 16 | do_install () { |
17 | oe_runmake install DESTDIR="${D}" bindir=${bindir} gitexecdir=${gitexecdir} \ | 17 | oe_runmake install DESTDIR="${D}" bindir=${bindir} \ |
18 | template_dir=${datadir}/git-core/templates \ | 18 | template_dir=${datadir}/git-core/templates \ |
19 | GIT_PYTHON_DIR=${D}${datadir}/git-core/python | 19 | GIT_PYTHON_DIR=${D}${datadir}/git-core/python |
20 | } | 20 | } |
21 | 21 | ||
22 | FILES_${PN} += "${datadir}/git-core" | 22 | FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" |
23 | FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" | ||
24 | |||
25 | # Git tools requiring perl | ||
26 | PACKAGES =+ "${PN}-perltools" | ||
27 | FILES_${PN}-perltools += " \ | ||
28 | ${libexecdir}/git-core/git-add--interactive \ | ||
29 | ${libexecdir}/git-core/git-archimport \ | ||
30 | ${libexecdir}/git-core/git-cvsexportcommit \ | ||
31 | ${libexecdir}/git-core/git-cvsimport \ | ||
32 | ${libexecdir}/git-core/git-cvsserver \ | ||
33 | ${bindir}/git-cvsserver \ | ||
34 | ${libexecdir}/git-core/git-difftool \ | ||
35 | ${libexecdir}/git-core/git-relink \ | ||
36 | ${libexecdir}/git-core/git-send-email \ | ||
37 | ${libexecdir}/git-core/git-svn \ | ||
38 | ${datadir}/perl \ | ||
39 | " | ||
40 | RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" | ||
41 | |||
42 | # git-tk package with gitk and git-gui | ||
43 | PACKAGES =+ "${PN}-tk" | ||
44 | RDEPENDS_${PN}-tk = "${PN} tk tcl" | ||
45 | EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh" | ||
46 | FILES_${PN}-tk = " \ | ||
47 | ${bindir}/gitk \ | ||
48 | ${datadir}/gitk \ | ||
49 | " | ||
50 | |||
23 | 51 | ||
24 | BBCLASSEXTEND = "native" | 52 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-devtools/git/git_1.7.4.3.bb b/meta/recipes-devtools/git/git_1.7.4.3.bb index 2ff1ed512e..45ef61b5e5 100644 --- a/meta/recipes-devtools/git/git_1.7.4.3.bb +++ b/meta/recipes-devtools/git/git_1.7.4.3.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require git.inc | 1 | require git.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ | 5 | EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ |
6 | ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ | 6 | ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ |