diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2011-04-30 10:21:15 +0200 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-05-08 23:49:25 -0700 |
| commit | 56aa79cda92479466dbf4657ca9ea35212b88cf6 (patch) | |
| tree | 1b6185b428dd43adf0182c7b965aaa271186f78c | |
| parent | 4f4bac0a459fe238e105e96b2b59b6af88e639c4 (diff) | |
| download | openembedded-core-56aa79cda92479466dbf4657ca9ea35212b88cf6.tar.gz openembedded-core-56aa79cda92479466dbf4657ca9ea35212b88cf6.tar.bz2 openembedded-core-56aa79cda92479466dbf4657ca9ea35212b88cf6.zip | |
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
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -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" inherit autotools do_install () { - oe_runmake install DESTDIR="${D}" bindir=${bindir} gitexecdir=${gitexecdir} \ + oe_runmake install DESTDIR="${D}" bindir=${bindir} \ template_dir=${datadir}/git-core/templates \ GIT_PYTHON_DIR=${D}${datadir}/git-core/python } -FILES_${PN} += "${datadir}/git-core" +FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" +FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" + +# Git tools requiring perl +PACKAGES =+ "${PN}-perltools" +FILES_${PN}-perltools += " \ + ${libexecdir}/git-core/git-add--interactive \ + ${libexecdir}/git-core/git-archimport \ + ${libexecdir}/git-core/git-cvsexportcommit \ + ${libexecdir}/git-core/git-cvsimport \ + ${libexecdir}/git-core/git-cvsserver \ + ${bindir}/git-cvsserver \ + ${libexecdir}/git-core/git-difftool \ + ${libexecdir}/git-core/git-relink \ + ${libexecdir}/git-core/git-send-email \ + ${libexecdir}/git-core/git-svn \ + ${datadir}/perl \ +" +RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" + +# git-tk package with gitk and git-gui +PACKAGES =+ "${PN}-tk" +RDEPENDS_${PN}-tk = "${PN} tk tcl" +EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh" +FILES_${PN}-tk = " \ + ${bindir}/gitk \ + ${datadir}/gitk \ +" + 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 @@ require git.inc -PR = "r1" +PR = "r2" 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} \ |