From 7040db74c375ef55d1b040f53071be29590882de Mon Sep 17 00:00:00 2001
From: Mihai Prica <mihai.prica@intel.com>
Date: Thu, 18 Apr 2013 18:10:42 +0300
Subject: libvirt: Changed python bindings install location

The libvirt-python files were installed to dist-packages and this
is not part of sys.path in yocto so they were not available to
python. Changed this to site-packages.

Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 recipes-extended/libvirt/libvirt-python.inc          |  4 ++--
 recipes-extended/libvirt/libvirt/python_incdir.patch | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index 49d15fb3..297e90c8 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -10,5 +10,5 @@ RDEPENDS_${PN}-python += "python"
 PACKAGECONFIG_${PN}-python[xen] = ",,,xen-python"
 
 PACKAGES += "${PN}-python-dbg ${PN}-python"
-FILES_${PN}-python-dbg += "${libdir}/${PYTHON_DIR}/dist-packages/.debug/"
-FILES_${PN}-python += "${libdir}/${PYTHON_DIR}/dist-packages"
+FILES_${PN}-python-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug/"
+FILES_${PN}-python += "${libdir}/${PYTHON_DIR}/site-packages"
diff --git a/recipes-extended/libvirt/libvirt/python_incdir.patch b/recipes-extended/libvirt/libvirt/python_incdir.patch
index 6c77b09a..5b78c13e 100644
--- a/recipes-extended/libvirt/libvirt/python_incdir.patch
+++ b/recipes-extended/libvirt/libvirt/python_incdir.patch
@@ -1,8 +1,8 @@
-Index: libvirt-0.10.2/configure.ac
+Index: libvirt-1.0.3/configure.ac
 ===================================================================
---- libvirt-0.10.2.orig/configure.ac	2012-10-29 11:59:27.091615491 +0200
-+++ libvirt-0.10.2/configure.ac	2012-10-29 12:09:50.067603647 +0200
-@@ -2397,6 +2397,11 @@
+--- libvirt-1.0.3.orig/configure.ac
++++ libvirt-1.0.3/configure.ac
+@@ -1878,6 +1878,11 @@ fi
  
  PYTHON_VERSION=
  PYTHON_INCLUDES=
@@ -14,9 +14,12 @@ Index: libvirt-0.10.2/configure.ac
  if test "$with_python" != "no" ; then
      if test -x "$with_python/bin/python"
      then
-@@ -2422,29 +2427,30 @@
-         AM_PATH_PYTHON(,, [:])
+@@ -1901,31 +1906,32 @@ if test "$with_python" != "no" ; then
  
+     if test "$with_python" = "yes" ; then
+         AM_PATH_PYTHON(,, [:])
+-
++        pyexecdir=$prefix/lib/python$PYTHON_VERSION/site-packages
          if test "$PYTHON" != : ; then
 -            PYTHON_CONFIG="$PYTHON-config"
 -
-- 
cgit v1.2.3-54-g00ecf