From 68d62ffe8b2cfc6eab5fdf9fcbc9b57613d85ff1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 5 Dec 2012 20:59:51 +0100 Subject: git: fix unpackaged python files * 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] (From OE-Core rev: 8231e9d455c71fe1bd3c4776985ff775c6af3f6d) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-devtools/git/git.inc | 4 ++-- meta/recipes-devtools/git/git_1.7.7.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/git') 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" -- cgit v1.1