Patchwork [4/5] git: fix unpackaged python files

login
register
mail settings
Submitter Martin Jansa
Date Dec. 5, 2012, 6:26 p.m.
Message ID <3ea1d54a3b1673540257592c1cfdaa9faf7a5d43.1354731942.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/40459/
State Superseded, archived
Headers show

Comments

Martin Jansa - Dec. 5, 2012, 6:26 p.m.
* 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>
---
 meta/recipes-devtools/git/git.inc      | 4 ++--
 meta/recipes-devtools/git/git_1.7.7.bb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Martin Jansa - Dec. 5, 2012, 7:05 p.m.
On Wed, Dec 05, 2012 at 07:26:06PM +0100, Martin Jansa wrote:
> * 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>
> ---
>  meta/recipes-devtools/git/git.inc      | 4 ++--
>  meta/recipes-devtools/git/git_1.7.7.bb | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
> index 55e1482..80a88c2 100644
> --- a/meta/recipes-devtools/git/git.inc
> +++ b/meta/recipes-devtools/git/git.inc
> @@ -16,7 +16,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
>  
>  EXTRA_OEMAKE = "NO_PYTHON=1"
>  
> -inherit autotools perlnative
> +inherit autotools perlnative python-dir
>  
>  do_compile_prepend () {
>  	# Remove perl/perl.mak to fix the out-of-date perl.mak error
> @@ -58,7 +58,7 @@ FILES_${PN}-perltools += " \
>  RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"
>  
>  PACKAGES =+ "${PN}-python"
> -FILES_${PN}-python = "${libdir}/python*"
> +FILES_${PN}-python = "${libdir}/python* ${PYTHON_SITEPACKAGES_DIR}"
>  
>  
>  # git-tk package with gitk and git-gui
> 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"

Oh, this isn't sometimes enough.. in some cases like commit message it's
using wrong python-config and installing to paths like on host (lib64).

Sending v2 soon

Cheers,

Patch

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 55e1482..80a88c2 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -16,7 +16,7 @@  EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
 
 EXTRA_OEMAKE = "NO_PYTHON=1"
 
-inherit autotools perlnative
+inherit autotools perlnative python-dir
 
 do_compile_prepend () {
 	# Remove perl/perl.mak to fix the out-of-date perl.mak error
@@ -58,7 +58,7 @@  FILES_${PN}-perltools += " \
 RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"
 
 PACKAGES =+ "${PN}-python"
-FILES_${PN}-python = "${libdir}/python*"
+FILES_${PN}-python = "${libdir}/python* ${PYTHON_SITEPACKAGES_DIR}"
 
 
 # git-tk package with gitk and git-gui
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"