[meta-virtualization] [PATCH 1/1] tgt: Do not install the conflicting config files
Tudor Florea
tudor.florea at enea.com
Fri Feb 13 13:58:50 PST 2015
Do not install the (empty) config files as it will
conflict with the real config file installed by python-cinder package.
Signed-off-by: Tudor Florea <tudor.florea at enea.com>
---
meta-openstack/recipes-support/tgt/tgt_git.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb
index 8be9fe4..b79cccc 100644
--- a/meta-openstack/recipes-support/tgt/tgt_git.bb
+++ b/meta-openstack/recipes-support/tgt/tgt_git.bb
@@ -22,7 +22,9 @@ do_compile() {
}
do_install() {
- oe_runmake -e DESTDIR="${D}" install-programs install-conf install-scripts
+ #skip oe_runmake install-conf. The (empty) targets.conf file will confilct with
+ #the real file provided by python-cinder
+ oe_runmake -e DESTDIR="${D}" install-programs install-scripts
if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/init.d
--
1.9.1
More information about the meta-virtualization
mailing list