python-nova*: FILES re-ordering and clarification

To prevent build errors to the order of evaluation of FILES_* we re-order
and clarify the contents of each package.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

2 files changed, 41 insertions, 27 deletions

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 a4822f2..b207a12 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
@@ -11,8 +11,8 @@ SRC_URI += "file://nova-all \
 
 inherit controller update-rc.d
 
-PACKAGES = "${SRCNAME}-controller ${SRCNAME}-controller-misc"
-# PACKAGES = "${SRCNAME}-controller-misc ${SRCNAME}-controller"
+#PACKAGES = "${SRCNAME}-controller ${SRCNAME}-controller-misc"
+PACKAGES = "${PN} ${PN}-dbg ${SRCNAME}-controller-misc ${SRCNAME}-controller"
 
 do_install_append() {
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
@@ -38,20 +38,30 @@ pkg_postinst_${SRCNAME}-controller () {
     nova-manage db sync
 }
 
-# FILES_${SRCNAME}-controller = "${files_${SRCNAME}-controller}"
-FILES_${SRCNAME}-controller = "${bindir}/* \
-                               ${sysconfdir}/${SRCNAME}/* \
-                               ${sysconfdir}/init.d/nova-all"
 
+#FILES_${SRCNAME}-controller = "${files_${SRCNAME}-controller}"
+#
 # 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 = "${libdir}/*\
-                                    ${bindir}/nova-compute \
-                                    ${sysconfdir}/${SRCNAME}/* \
-                                    ${sysconfdir}/init.d/nova-compute \
-                                    ${bindir}/nova-manage \
-                                    ${bindir}/nova-rootwrap \
-                                    ${sysconfdir}/sudoers.d"
+
+#FILES_${SRCNAME}-controller-misc = "${files_${SRCNAME}-compute} 
+#${files_${SRCNAME}-common} ${files_${PYTHON_PN}}"
+
+FILES_${SRCNAME}-controller = " \
+        ${bindir} \
+        ${sysconfdir}/${SRCNAME}/* \
+        ${sysconfdir}/init.d/nova-all"
+
+FILES_${SRCNAME}-controller-misc = " \
+        ${bindir}/nova-compute \
+        ${sysconfdir}/${SRCNAME}/* \
+        ${sysconfdir}/init.d/nova-compute \
+        ${bindir}/nova-manage \
+        ${bindir}/nova-rootwrap \
+        ${sysconfdir}/sudoers.d \
+        ${libdir}"
+
+FILES_${PN} = " \
+        ${libdir}/python*/site-packages"
 
 RDEPENDS_${SRCNAME}-controller = "${PYTHON_PN} ${SRCNAME}-common \
                                   postgresql postgresql-client python-psycopg2"
diff --git a/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb
index c48f8d1..bd54d4e 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb
@@ -12,21 +12,25 @@ pkg_postinst_${SRCNAME}-common () {
 
 PACKAGES += "${SRCNAME}-common ${SRCNAME}-common-misc"
 
-# FILES_${PN} = "${files_${PN}}"
-FILES_${PN} = "${libdir}/*"
+#FILES_${PN} = "${files_${PN}}"
+#
+#FILES_${SRCNAME}-common = "${files_${SRCNAME}-common}"
+#
+#FILES_${SRCNAME}-common-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-controller}"
 
-# FILES_${SRCNAME}-common = "${files_${SRCNAME}-common}"
-FILES_${SRCNAME}-common = "${bindir}/nova-manage \
-                           ${bindir}/nova-rootwrap \
-                           ${sysconfdir}/sudoers.d"
+FILES_${PN} = "${libdir}/python*"
 
-# FILES_${SRCNAME}-common-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-controller}"
-FILES_${SRCNAME}-common-misc = "${bindir}/nova-compute \
-                                ${sysconfdir}/${SRCNAME}/* \
-                                ${sysconfdir}/init.d/nova-compute \
-                                ${bindir}/* \
-                                ${sysconfdir}/${SRCNAME}/* \
-                                ${sysconfdir}/init.d/nova-all"
+FILES_${SRCNAME}-common = " \
+        ${bindir}/nova-manage \
+        ${bindir}/nova-rootwrap \
+        ${sysconfdir}/sudoers.d"
+
+FILES_${SRCNAME}-common-misc = " \
+        ${bindir}/nova-compute \
+        ${sysconfdir}/${SRCNAME}/* \
+        ${sysconfdir}/init.d/nova-compute \
+        ${bindir} \
+        ${sysconfdir}/init.d/nova-all"
 
 RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \
         iptables curl dnsmasq sudo procps"