From 7b270e7e30148f30e9ae5c649febba4ae368b627 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri, 6 Sep 2013 16:35:23 -0400
Subject: python-nova: use explicit file lists, versus variables

By setting the FILES_ packaging variables via .inc local vars,
we can run into trouble with variable resolution timing and hence
packaging fails.

We temporarily switch back to explicit (and duplicated) file lists
to fix packaging

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-nova-controller_2013.1.3.bb            | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb')

diff --git a/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb
index 686c1d7..a4822f2 100644
--- a/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb
@@ -12,6 +12,7 @@ SRC_URI += "file://nova-all \
 inherit controller update-rc.d
 
 PACKAGES = "${SRCNAME}-controller ${SRCNAME}-controller-misc"
+# PACKAGES = "${SRCNAME}-controller-misc ${SRCNAME}-controller"
 
 do_install_append() {
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
@@ -37,11 +38,20 @@ pkg_postinst_${SRCNAME}-controller () {
     nova-manage db sync
 }
 
-
-FILES_${SRCNAME}-controller = "${files_${SRCNAME}-controller}"
+# FILES_${SRCNAME}-controller = "${files_${SRCNAME}-controller}"
+FILES_${SRCNAME}-controller = "${bindir}/* \
+			       ${sysconfdir}/${SRCNAME}/* \
+			       ${sysconfdir}/init.d/nova-all"
 
 # If the compute is built, so we package it out of the way
-FILES_${SRCNAME}-controller-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-common} ${files_${PYTHON_PN}}"
+# FILES_${SRCNAME}-controller-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-common} ${files_${PYTHON_PN}}"
+FILES_${SRCNAME}-controller-misc = "${libdir}/*\
+				    ${bindir}/nova-compute \
+				    ${sysconfdir}/${SRCNAME}/* \
+				    ${sysconfdir}/init.d/nova-compute \
+				    ${bindir}/nova-manage \
+				    ${bindir}/nova-rootwrap \
+				    ${sysconfdir}/sudoers.d"
 
 RDEPENDS_${SRCNAME}-controller = "${PYTHON_PN} ${SRCNAME}-common \
                                   postgresql postgresql-client python-psycopg2"
-- 
cgit v1.2.3-54-g00ecf