[PATCH 1/1] tgt: Do not install the conflicting config files

[PATCH 1/1] tgt: Do not install the conflicting config files

[Tudor Florea]

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@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

Re: [PATCH 1/1] tgt: Do not install the conflicting config files

[Bruce Ashfield]

On Fri, Feb 13, 2015 at 4:58 PM, Tudor Florea <tudor.florea@enea.com> wrote:
> 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@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

Typo: "conflict".

> +    #the real file provided by python-cinder
> +    oe_runmake -e DESTDIR="${D}" install-programs install-scripts

.. but I'm not convinced of this change. When you say "conflict", are
you getting a
packaging error that I'm not seeing in my builds, or something else ?

Sure both packages may be trying to write the same file, but I'm also aware of
scenarios where you might not want Cinder's file to take precedence. So in that
case, we should consider patching and renaming the files, versus simply not
installing them.

Bruce

>
>      if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
>          install -d ${D}${sysconfdir}/init.d
> --
> 1.9.1
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Re: [PATCH 1/1] tgt: Do not install the conflicting config files

[Tudor Florea]

> -----Original Message-----
> From: Bruce Ashfield [mailto:bruce.ashfield@gmail.com]
> Sent: Tuesday, February 17, 2015 06:55
> To: Tudor Florea
> Cc: meta-virtualization@yoctoproject.org
> Subject: Re: [meta-virtualization] [PATCH 1/1] tgt: Do not install the
> conflicting config files
> 
> On Fri, Feb 13, 2015 at 4:58 PM, Tudor Florea <tudor.florea@enea.com>
> wrote:
> > 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@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
> 
> Typo: "conflict".
> 
> > +    #the real file provided by python-cinder
> > +    oe_runmake -e DESTDIR="${D}" install-programs install-scripts
> 
> .. but I'm not convinced of this change. When you say "conflict", are
> you getting a
> packaging error that I'm not seeing in my builds, or something else ?
[Tudor Florea] The error I'm getting is:
* check_data_file_clashes: Package tgt wants to install file  <path_to>/openstack-image-controller/1.0-r0/rootfs/etc/tgt/targets.conf
	But that file is already provided by package  * python-cinder
 * opkg_install_cmd: Cannot install package packagegroup-cloud-controller.
ERROR: Function failed: do_rootfs

> 
> Sure both packages may be trying to write the same file, but I'm also aware
> of
> scenarios where you might not want Cinder's file to take precedence. So in
> that
> case, we should consider patching and renaming the files, versus simply not
> installing them.
> 

[Tudor Florea] 
The content of /etc/tgt/targets.conf installed from tgt is kind of empty:
# Empty targets configuration file -- please see the package
# documentation directory for an example.

The paradigm will be the same for using  two different install locations. At the end we should have only one config file named /etc/tgt/targets.conf. I assume that one willing to use a particular config will create bbappend files for tgt and/or python-cinder for his/her specific customization.
I'm not particularly content about my fix but I don't know what is the right way to solve this kind of issue.
Regards,
  Tudor.

> Bruce
> 
> >
> >      if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)};
> then
> >          install -d ${D}${sysconfdir}/init.d
> > --
> > 1.9.1
> >
> > --
> > _______________________________________________
> > meta-virtualization mailing list
> > meta-virtualization@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-virtualization
> 
> 
> 
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"