| Submitter | Martin Jansa |
|---|---|
| Date | Dec. 5, 2012, 7:59 p.m. |
| Message ID | <d14951f1a0d4ae245780a6520d18588ce8594e40.1354737450.git.Martin.Jansa@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/40493/ |
| State | Accepted |
| Commit | 8231e9d455c71fe1bd3c4776985ff775c6af3f6d |
| Headers | show |
Comments
Patch
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 55e1482..82df6e3 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -14,10 +14,10 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ --without-tcltk \ " -EXTRA_OEMAKE = "NO_PYTHON=1" - inherit autotools perlnative +EXTRA_OEMAKE = "NO_PYTHON=1" + do_compile_prepend () { # Remove perl/perl.mak to fix the out-of-date perl.mak error # during rebuild diff --git a/meta/recipes-devtools/git/git_1.7.7.bb b/meta/recipes-devtools/git/git_1.7.7.bb index 9d24911..6b6e04b 100644 --- a/meta/recipes-devtools/git/git_1.7.7.bb +++ b/meta/recipes-devtools/git/git_1.7.7.bb @@ -1,6 +1,6 @@ require git.inc -PR = "r2" +PR = "r3" SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz" SRC_URI[md5sum] = "5d645884e688921e773186783b65ce33"
* EXTRA_OEMAKE is needed after inheriting autotools which sets it to empty * fixes: git-1.7.7: git: Files/directories were installed but not shipped /usr/lib64 /usr/lib64/python2.7 /usr/lib64/python2.7/site-packages /usr/lib64/python2.7/site-packages/git_remote_helpers-0.1.0-py2.7.egg-info /usr/lib64/python2.7/site-packages/git_remote_helpers /usr/lib64/python2.7/site-packages/git_remote_helpers/__init__.py /usr/lib64/python2.7/site-packages/git_remote_helpers/util.pyc /usr/lib64/python2.7/site-packages/git_remote_helpers/__init__.pyc /usr/lib64/python2.7/site-packages/git_remote_helpers/util.py /usr/lib64/python2.7/site-packages/git_remote_helpers/git /usr/lib64/python2.7/site-packages/git_remote_helpers/git/__init__.py /usr/lib64/python2.7/site-packages/git_remote_helpers/git/importer.pyc /usr/lib64/python2.7/site-packages/git_remote_helpers/git/non_local.pyc /usr/lib64/python2.7/site-packages/git_remote_helpers/git/exporter.py /usr/lib64/python2.7/site-packages/git_remote_helpers/git/git.py /usr/lib64/python2.7/site-packages/git_remote_helpers/git/repo.py /usr/lib64/python2.7/site-packages/git_remote_helpers/git/__init__.pyc /usr/lib64/python2.7/site-packages/git_remote_helpers/git/importer.py /usr/lib64/python2.7/site-packages/git_remote_helpers/git/exporter.pyc /usr/lib64/python2.7/site-packages/git_remote_helpers/git/repo.pyc /usr/lib64/python2.7/site-packages/git_remote_helpers/git/git.pyc /usr/lib64/python2.7/site-packages/git_remote_helpers/git/non_local.py * fixes [YOCTO #3344] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- v2: should be disabled correctly now, instead of packaging them meta/recipes-devtools/git/git.inc | 4 ++-- meta/recipes-devtools/git/git_1.7.7.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)