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>

1 files changed, 17 insertions, 13 deletions

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"