diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2013-09-07 00:37:33 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-09-15 21:59:45 -0400 |
commit | 1bff130b557dc2217a0a67fd8a336793539ecf8e (patch) | |
tree | 8e4f9ad13592c4a9f4e5061710e3f07df1425d88 /meta-openstack/recipes-devtools | |
parent | 1453046b2efa44a35f324416dc6d1da4af5a209d (diff) | |
download | meta-cloud-services-1bff130b557dc2217a0a67fd8a336793539ecf8e.tar.gz |
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>
Diffstat (limited to 'meta-openstack/recipes-devtools')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb | 38 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb | 30 |
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 \ | |||
11 | 11 | ||
12 | inherit controller update-rc.d | 12 | inherit controller update-rc.d |
13 | 13 | ||
14 | PACKAGES = "${SRCNAME}-controller ${SRCNAME}-controller-misc" | 14 | #PACKAGES = "${SRCNAME}-controller ${SRCNAME}-controller-misc" |
15 | # PACKAGES = "${SRCNAME}-controller-misc ${SRCNAME}-controller" | 15 | PACKAGES = "${PN} ${PN}-dbg ${SRCNAME}-controller-misc ${SRCNAME}-controller" |
16 | 16 | ||
17 | do_install_append() { | 17 | do_install_append() { |
18 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 18 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
@@ -38,20 +38,30 @@ pkg_postinst_${SRCNAME}-controller () { | |||
38 | nova-manage db sync | 38 | nova-manage db sync |
39 | } | 39 | } |
40 | 40 | ||
41 | # FILES_${SRCNAME}-controller = "${files_${SRCNAME}-controller}" | ||
42 | FILES_${SRCNAME}-controller = "${bindir}/* \ | ||
43 | ${sysconfdir}/${SRCNAME}/* \ | ||
44 | ${sysconfdir}/init.d/nova-all" | ||
45 | 41 | ||
42 | #FILES_${SRCNAME}-controller = "${files_${SRCNAME}-controller}" | ||
43 | # | ||
46 | # If the compute is built, so we package it out of the way | 44 | # If the compute is built, so we package it out of the way |
47 | # FILES_${SRCNAME}-controller-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-common} ${files_${PYTHON_PN}}" | 45 | |
48 | FILES_${SRCNAME}-controller-misc = "${libdir}/*\ | 46 | #FILES_${SRCNAME}-controller-misc = "${files_${SRCNAME}-compute} |
49 | ${bindir}/nova-compute \ | 47 | #${files_${SRCNAME}-common} ${files_${PYTHON_PN}}" |
50 | ${sysconfdir}/${SRCNAME}/* \ | 48 | |
51 | ${sysconfdir}/init.d/nova-compute \ | 49 | FILES_${SRCNAME}-controller = " \ |
52 | ${bindir}/nova-manage \ | 50 | ${bindir} \ |
53 | ${bindir}/nova-rootwrap \ | 51 | ${sysconfdir}/${SRCNAME}/* \ |
54 | ${sysconfdir}/sudoers.d" | 52 | ${sysconfdir}/init.d/nova-all" |
53 | |||
54 | FILES_${SRCNAME}-controller-misc = " \ | ||
55 | ${bindir}/nova-compute \ | ||
56 | ${sysconfdir}/${SRCNAME}/* \ | ||
57 | ${sysconfdir}/init.d/nova-compute \ | ||
58 | ${bindir}/nova-manage \ | ||
59 | ${bindir}/nova-rootwrap \ | ||
60 | ${sysconfdir}/sudoers.d \ | ||
61 | ${libdir}" | ||
62 | |||
63 | FILES_${PN} = " \ | ||
64 | ${libdir}/python*/site-packages" | ||
55 | 65 | ||
56 | RDEPENDS_${SRCNAME}-controller = "${PYTHON_PN} ${SRCNAME}-common \ | 66 | RDEPENDS_${SRCNAME}-controller = "${PYTHON_PN} ${SRCNAME}-common \ |
57 | postgresql postgresql-client python-psycopg2" | 67 | 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 () { | |||
12 | 12 | ||
13 | PACKAGES += "${SRCNAME}-common ${SRCNAME}-common-misc" | 13 | PACKAGES += "${SRCNAME}-common ${SRCNAME}-common-misc" |
14 | 14 | ||
15 | # FILES_${PN} = "${files_${PN}}" | 15 | #FILES_${PN} = "${files_${PN}}" |
16 | FILES_${PN} = "${libdir}/*" | 16 | # |
17 | #FILES_${SRCNAME}-common = "${files_${SRCNAME}-common}" | ||
18 | # | ||
19 | #FILES_${SRCNAME}-common-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-controller}" | ||
17 | 20 | ||
18 | # FILES_${SRCNAME}-common = "${files_${SRCNAME}-common}" | 21 | FILES_${PN} = "${libdir}/python*" |
19 | FILES_${SRCNAME}-common = "${bindir}/nova-manage \ | ||
20 | ${bindir}/nova-rootwrap \ | ||
21 | ${sysconfdir}/sudoers.d" | ||
22 | 22 | ||
23 | # FILES_${SRCNAME}-common-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-controller}" | 23 | FILES_${SRCNAME}-common = " \ |
24 | FILES_${SRCNAME}-common-misc = "${bindir}/nova-compute \ | 24 | ${bindir}/nova-manage \ |
25 | ${sysconfdir}/${SRCNAME}/* \ | 25 | ${bindir}/nova-rootwrap \ |
26 | ${sysconfdir}/init.d/nova-compute \ | 26 | ${sysconfdir}/sudoers.d" |
27 | ${bindir}/* \ | 27 | |
28 | ${sysconfdir}/${SRCNAME}/* \ | 28 | FILES_${SRCNAME}-common-misc = " \ |
29 | ${sysconfdir}/init.d/nova-all" | 29 | ${bindir}/nova-compute \ |
30 | ${sysconfdir}/${SRCNAME}/* \ | ||
31 | ${sysconfdir}/init.d/nova-compute \ | ||
32 | ${bindir} \ | ||
33 | ${sysconfdir}/init.d/nova-all" | ||
30 | 34 | ||
31 | RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ | 35 | RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ |
32 | iptables curl dnsmasq sudo procps" | 36 | iptables curl dnsmasq sudo procps" |