summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-11-07 17:24:36 +0100
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-11-09 23:03:55 -0500
commit19c3d8bab401e5b17605de359914419b6c65d8d6 (patch)
tree50fba75e2c2ccdf6a13d984a73bd133a85761413
parent515f39e4530ae0f3f279304a77343fbb88e2362f (diff)
downloadmeta-virtualization-19c3d8bab401e5b17605de359914419b6c65d8d6.tar.gz
cloud-init: add dependency on systemd to fix installed-vs-shipped QA issue
* without systemd in RSS, setup.py will fail to call: "pkg-config systemd --variable=systemdsystemunitdir" and then clound-init might fail with: ERROR: cloud-init-20.3-r0 do_package: QA Issue: cloud-init: Files/directories were installed but not shipped in any package: /lib/systemd /lib/systemd/system-generators /lib/systemd/system /lib/systemd/system-generators/cloud-init-generator /lib/systemd/system/cloud-final.service /lib/systemd/system/cloud-init.service /lib/systemd/system/cloud-config.target /lib/systemd/system/cloud-init.target /lib/systemd/system/cloud-init-local.service /lib/systemd/system/cloud-config.service Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. cloud-init: 10 installed and not shipped files. [installed-vs-shipped] when systemd on host or in the systemd fallback uses different systemdsystemunitdir value than what OE packages with: FILES_${PN}-systemd += "${systemd_unitdir}/*" setup.py fallback: def pkg_config_read(library, var): fallbacks = { 'systemd': { 'systemdsystemunitdir': '/lib/systemd/system', 'systemdsystemgeneratordir': '/lib/systemd/system-generators', } } .. ubuntu: meta-virtualization$ pkg-config systemd --variable=systemdsystemunitdir /lib/systemd/system OE (with usrmerge in DISTRO_FEATURES): cloud-init/20.3-r0$ pkg-config systemd --variable=systemdsystemunitdir /usr/lib/systemd/system Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-extended/cloud-init/cloud-init_20.3.bb3
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-extended/cloud-init/cloud-init_20.3.bb b/recipes-extended/cloud-init/cloud-init_20.3.bb
index 31b4066f..53d71a6d 100644
--- a/recipes-extended/cloud-init/cloud-init_20.3.bb
+++ b/recipes-extended/cloud-init/cloud-init_20.3.bb
@@ -25,6 +25,9 @@ inherit setuptools3
25inherit update-rc.d 25inherit update-rc.d
26inherit systemd 26inherit systemd
27 27
28# setup.py calls "pkg-config systemd --variable=systemdsystemunitdir" and needs to find our systemd
29DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
30
28inherit python3native 31inherit python3native
29 32
30PACKAGES += "${PN}-systemd" 33PACKAGES += "${PN}-systemd"