From 116a12ed48345159690a5504cb67fd8c9e63150c Mon Sep 17 00:00:00 2001
From: fli <fupan.li@windriver.com>
Date: Mon, 13 Mar 2017 00:39:17 -0700
Subject: qpid: fix the wrong python dir issue

qpid used the wrong python path and thus cannot
package the files installed. This commit will fix
the following warning issue:

WARNING: QA Issue: qpid: Files/directories were installed but not shipped in any package:
  /usr/lib/python2.7/site-packages/qmfengine.py
  /usr/lib/python2.7/site-packages/qmf.py
  /usr/lib/python2.7/site-packages/_qmfengine.so
  /usr/lib/python2.7/site-packages/_qmfengine.la
  /usr/lib/python2.7/site-packages/qmfengine.pyo
  /usr/lib/python2.7/site-packages/qmf.pyo
  /usr/lib/python2.7/site-packages/cqpid.py
  /usr/lib/python2.7/site-packages/_cqpid.so
  /usr/lib/python2.7/site-packages/_cqpid.la
  /usr/lib/python2.7/site-packages/cqpid.pyo
  /usr/lib/python2.7/site-packages/qmf2.py
  /usr/lib/python2.7/site-packages/cqmf2.py
  /usr/lib/python2.7/site-packages/_cqmf2.so
  /usr/lib/python2.7/site-packages/_cqmf2.la
  /usr/lib/python2.7/site-packages/qmf2.pyo
  /usr/lib/python2.7/site-packages/cqmf2.pyo
  /usr/lib/python2.7/site-packages/qmfgen
  /usr/lib/python2.7/site-packages/qmfgen/__init__.py
  /usr/lib/python2.7/site-packages/qmfgen/generate.py
  /usr/lib/python2.7/site-packages/qmfgen/schema.py
  /usr/lib/python2.7/site-packages/qmfgen/management-types.xml
  /usr/lib/python2.7/site-packages/qmfgen/__init__.pyo
  /usr/lib/python2.7/site-packages/qmfgen/generate.pyo
  /usr/lib/python2.7/site-packages/qmfgen/schema.pyo
  /usr/lib/python2.7/site-packages/qmfgen/templates
  /usr/lib/python2.7/site-packages/qmfgen/templates/Args.h
  /usr/lib/python2.7/site-packages/qmfgen/templates/Class.cpp
  /usr/lib/python2.7/site-packages/qmfgen/templates/Class.h
  /usr/lib/python2.7/site-packages/qmfgen/templates/CMakeLists.cmake
  /usr/lib/python2.7/site-packages/qmfgen/templates/Event.cpp
  /usr/lib/python2.7/site-packages/qmfgen/templates/Event.h
  /usr/lib/python2.7/site-packages/qmfgen/templates/Makefile.mk
  /usr/lib/python2.7/site-packages/qmfgen/templates/Package.cpp
  /usr/lib/python2.7/site-packages/qmfgen/templates/Package.h
  /usr/lib/python2.7/site-packages/qmfgen/templates/V2Package.cpp
  /usr/lib/python2.7/site-packages/qmfgen/templates/V2Package.h
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
qpid: 36 installed and not shipped files. [installed-vs-shipped]

Signed-off-by: fli <fupan.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-extended/qpid/qpid_0.20.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'meta-openstack/recipes-extended/qpid/qpid_0.20.bb')

diff --git a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
index 5e6ae2d..b76f76d 100644
--- a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
+++ b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
@@ -27,7 +27,10 @@ export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version
 export PERL="${STAGING_BINDIR}/perl"
 
 EXTRA_OECONF += " --without-help2man SASL_PASSWD=/usr/sbin/saslpasswd2"
-EXTRA_OEMAKE += " CPPFLAGS=-Wno-unused-function "
+EXTRA_OEMAKE += " CPPFLAGS=-Wno-unused-function \
+        pyexecdir=${PYTHON_SITEPACKAGES_DIR} \
+        pythondir=${PYTHON_SITEPACKAGES_DIR} \
+"
 
 do_install_append() {
      install -d ${D}${sysconfdir}/init.d
-- 
cgit v1.2.3-54-g00ecf