[PATCH] Add sample eppic scripts to kexec-tools-eppic package

[WANG Chao]

Upstream makedumpfile contains some sample eppic scripts for reference.
Now pull the whole scripts directory into kexec-tools-eppic package.

Signed-off-by: WANG Chao 
---
 kexec-tools.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kexec-tools.spec b/kexec-tools.spec
index af0c69b..6411ccf 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -203,6 +203,8 @@ install -m 644 makedumpfile-1.5.6/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/m
 install -m 644 makedumpfile-1.5.6/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz
 install -m 644 makedumpfile-1.5.6/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
 install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
+mkdir -p $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
+install -m 644 makedumpfile-1.5.6/eppic_scripts/* $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
 %endif
 make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
 %find_lang kdump-anaconda-addon
@@ -324,6 +326,7 @@ done
 %ifarch %{ix86} x86_64 ppc64 s390x
 %files eppic
 %{_libdir}/eppic_makedumpfile.so
+/usr/share/makedumpfile/eppic_scripts/
 %endif

%files anaconda-addon -f kdump-anaconda-addon.lang

[Dave Young]

On 09/18/14 at 01:49pm, WANG Chao wrote:
> Upstream makedumpfile contains some sample eppic scripts for reference.
> Now pull the whole scripts directory into kexec-tools-eppic package.
>
> Signed-off-by: WANG Chao

ACK
> kexec-tools.spec | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/kexec-tools.spec b/kexec-tools.spec
> index af0c69b..6411ccf 100644
> --- a/kexec-tools.spec
> +++ b/kexec-tools.spec
> @@ -203,6 +203,8 @@ install -m 644 makedumpfile-1.5.6/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/m
>  install -m 644 makedumpfile-1.5.6/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz
>  install -m 644 makedumpfile-1.5.6/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
>  install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
> +mkdir -p $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
> +install -m 644 makedumpfile-1.5.6/eppic_scripts/* $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
>  %endif
>  make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
>  %find_lang kdump-anaconda-addon
> @@ -324,6 +326,7 @@ done
>  %ifarch %{ix86} x86_64 ppc64 s390x
>  %files eppic
>  %{_libdir}/eppic_makedumpfile.so
> +/usr/share/makedumpfile/eppic_scripts/
>  %endif
> %files anaconda-addon -f kdump-anaconda-addon.lang
>
> 1.9.3
>
> kexec mailing list
> [e-mail]
> https://lists.fedoraproject.org/mailman/listinfo/kexec

[Vivek Goyal]

On Thu, Sep 18, 2014 at 01:49:09PM +0800, WANG Chao wrote:
> Upstream makedumpfile contains some sample eppic scripts for reference.
> Now pull the whole scripts directory into kexec-tools-eppic package.
>
> Signed-off-by: WANG Chao

If scripts are part of makedumpfile, then it should be part of kexec-tools
package and not kexec-tools-eppic?

Thanks
Vivek
> kexec-tools.spec | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/kexec-tools.spec b/kexec-tools.spec
> index af0c69b..6411ccf 100644
> --- a/kexec-tools.spec
> +++ b/kexec-tools.spec
> @@ -203,6 +203,8 @@ install -m 644 makedumpfile-1.5.6/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/m
>  install -m 644 makedumpfile-1.5.6/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz
>  install -m 644 makedumpfile-1.5.6/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
>  install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
> +mkdir -p $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
> +install -m 644 makedumpfile-1.5.6/eppic_scripts/* $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
>  %endif
>  make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
>  %find_lang kdump-anaconda-addon
> @@ -324,6 +326,7 @@ done
>  %ifarch %{ix86} x86_64 ppc64 s390x
>  %files eppic
>  %{_libdir}/eppic_makedumpfile.so
> +/usr/share/makedumpfile/eppic_scripts/
>  %endif
> %files anaconda-addon -f kdump-anaconda-addon.lang
>
> 1.9.3
>
> kexec mailing list
> [e-mail]
> https://lists.fedoraproject.org/mailman/listinfo/kexec

[WANG Chao]

On 09/18/14 at 09:24am, Vivek Goyal wrote:
> On Thu, Sep 18, 2014 at 01:49:09PM +0800, WANG Chao wrote:
> > Upstream makedumpfile contains some sample eppic scripts for reference.
> > Now pull the whole scripts directory into kexec-tools-eppic package.
> >
> > Signed-off-by: WANG Chao
>
> If scripts are part of makedumpfile, then it should be part of kexec-tools
> package and not kexec-tools-eppic?

# rpm -ql kexec-tools-eppic
/usr/lib64/eppic_makedumpfile.so

These sample scripts are eppic language, and they  won't work without
eppic_makedumpfile.so. It makes sense to put them along with
eppic_makedumpfile.so. That means in kexec-tools-eppic package.

Thanks
WANG Chao
> Thanks
> Vivek
> > kexec-tools.spec | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/kexec-tools.spec b/kexec-tools.spec
> > index af0c69b..6411ccf 100644
> > --- a/kexec-tools.spec
> > +++ b/kexec-tools.spec
> > @@ -203,6 +203,8 @@ install -m 644 makedumpfile-1.5.6/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/m
> >  install -m 644 makedumpfile-1.5.6/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz
> >  install -m 644 makedumpfile-1.5.6/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
> >  install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
> > +mkdir -p $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
> > +install -m 644 makedumpfile-1.5.6/eppic_scripts/* $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
> >  %endif
> >  make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
> >  %find_lang kdump-anaconda-addon
> > @@ -324,6 +326,7 @@ done
> >  %ifarch %{ix86} x86_64 ppc64 s390x
> >  %files eppic
> >  %{_libdir}/eppic_makedumpfile.so
> > +/usr/share/makedumpfile/eppic_scripts/
> >  %endif
> > %files anaconda-addon -f kdump-anaconda-addon.lang
> >
> > 1.9.3
> >
> > kexec mailing list
> > [e-mail]
> > https://lists.fedoraproject.org/mailman/listinfo/kexec

[Vivek Goyal]

On Fri, Sep 19, 2014 at 11:03:04AM +0800, WANG Chao wrote:
> On 09/18/14 at 09:24am, Vivek Goyal wrote:
> > On Thu, Sep 18, 2014 at 01:49:09PM +0800, WANG Chao wrote:
> > > Upstream makedumpfile contains some sample eppic scripts for reference.
> > > Now pull the whole scripts directory into kexec-tools-eppic package.
> > >
> > > Signed-off-by: WANG Chao
> >
> > If scripts are part of makedumpfile, then it should be part of kexec-tools
> > package and not kexec-tools-eppic?
>
> # rpm -ql kexec-tools-eppic
> /usr/lib64/eppic_makedumpfile.so
>
> These sample scripts are eppic language, and they  won't work without
> eppic_makedumpfile.so. It makes sense to put them along with
> eppic_makedumpfile.so. That means in kexec-tools-eppic package.

I don't think it is a good idea to take this code away from makedumpfile
and pack into kexec-tools-eppic package. If there is a dependency, then
we need to make kexec-tools package dependent on kexec-tools-eppic.

I think more we move away from upstream, more prblems it will create for
us going down the line.

So I would still prefer that we pacakge these scripts as part of
kexec-tools as these are part of makeudmpfile upstream. And if need be
create a dependency on kexec-tools-eppic package during installation.

Thanks
Vivek
> Thanks
> WANG Chao
> > Thanks
> > Vivek
> > > kexec-tools.spec | 3 +++
> > >  1 file changed, 3 insertions(+)
> > >
> > > diff --git a/kexec-tools.spec b/kexec-tools.spec
> > > index af0c69b..6411ccf 100644
> > > --- a/kexec-tools.spec
> > > +++ b/kexec-tools.spec
> > > @@ -203,6 +203,8 @@ install -m 644 makedumpfile-1.5.6/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/m
> > >  install -m 644 makedumpfile-1.5.6/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz
> > >  install -m 644 makedumpfile-1.5.6/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
> > >  install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
> > > +mkdir -p $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
> > > +install -m 644 makedumpfile-1.5.6/eppic_scripts/* $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
> > >  %endif
> > >  make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
> > >  %find_lang kdump-anaconda-addon
> > > @@ -324,6 +326,7 @@ done
> > >  %ifarch %{ix86} x86_64 ppc64 s390x
> > >  %files eppic
> > >  %{_libdir}/eppic_makedumpfile.so
> > > +/usr/share/makedumpfile/eppic_scripts/
> > >  %endif
> > > %files anaconda-addon -f kdump-anaconda-addon.lang
> > >
> > > 1.9.3
> > >
> > > kexec mailing list
> > > [e-mail]
> > > https://lists.fedoraproject.org/mailman/listinfo/kexec

[WANG Chao]

On 09/19/14 at 09:12am, Vivek Goyal wrote:
> On Fri, Sep 19, 2014 at 11:03:04AM +0800, WANG Chao wrote:
> > On 09/18/14 at 09:24am, Vivek Goyal wrote:
> > > On Thu, Sep 18, 2014 at 01:49:09PM +0800, WANG Chao wrote:
> > > > Upstream makedumpfile contains some sample eppic scripts for reference.
> > > > Now pull the whole scripts directory into kexec-tools-eppic package.
> > > >
> > > > Signed-off-by: WANG Chao
> > >
> > > If scripts are part of makedumpfile, then it should be part of kexec-tools
> > > package and not kexec-tools-eppic?
> >
> > # rpm -ql kexec-tools-eppic
> > /usr/lib64/eppic_makedumpfile.so
> >
> > These sample scripts are eppic language, and they  won't work without
> > eppic_makedumpfile.so. It makes sense to put them along with
> > eppic_makedumpfile.so. That means in kexec-tools-eppic package.
>
> I don't think it is a good idea to take this code away from makedumpfile
> and pack into kexec-tools-eppic package. If there is a dependency, then
> we need to make kexec-tools package dependent on kexec-tools-eppic.

eppic_makedumpfile.so is also built within makedumpfile. But we packed
it in kexec-tools-eppic. I don't why we did that at the first place
though.
> I think more we move away from upstream, more prblems it will create for
> us going down the line.

We don't move away from upstream. We just pack makedumpfile binaries
into two packages. It's already done like that.
> So I would still prefer that we pacakge these scripts as part of
> kexec-tools as these are part of makeudmpfile upstream. And if need be
> create a dependency on kexec-tools-eppic package during installation.

I don't think putting these scripts into kexec-tools make sense. Because
eppic support is more like a "plugin" for makedumpfile. Now we put
eppic_makedumpfile.so in kexec-tools-eppic, we should put the sample
scripts for this "plugin" all together with the "plugin". It doesn't
sound right to me to seperate the sample eppic scripts and
eppic_makedumpfile.so, because the sample eppic scripts standalone
doesn't work and people have no idea what're these for.

Thanks
WANG Chao

[Vivek Goyal]

On Mon, Sep 22, 2014 at 01:55:56PM +0800, WANG Chao wrote:
> On 09/19/14 at 09:12am, Vivek Goyal wrote:
> > On Fri, Sep 19, 2014 at 11:03:04AM +0800, WANG Chao wrote:
> > > On 09/18/14 at 09:24am, Vivek Goyal wrote:
> > > > On Thu, Sep 18, 2014 at 01:49:09PM +0800, WANG Chao wrote:
> > > > > Upstream makedumpfile contains some sample eppic scripts for reference.
> > > > > Now pull the whole scripts directory into kexec-tools-eppic package.
> > > > >
> > > > > Signed-off-by: WANG Chao
> > > >
> > > > If scripts are part of makedumpfile, then it should be part of kexec-tools
> > > > package and not kexec-tools-eppic?
> > >
> > > # rpm -ql kexec-tools-eppic
> > > /usr/lib64/eppic_makedumpfile.so
> > >
> > > These sample scripts are eppic language, and they  won't work without
> > > eppic_makedumpfile.so. It makes sense to put them along with
> > > eppic_makedumpfile.so. That means in kexec-tools-eppic package.
> >
> > I don't think it is a good idea to take this code away from makedumpfile
> > and pack into kexec-tools-eppic package. If there is a dependency, then
> > we need to make kexec-tools package dependent on kexec-tools-eppic.
>
> eppic_makedumpfile.so is also built within makedumpfile. But we packed
> it in kexec-tools-eppic. I don't why we did that at the first place
> though.
> > I think more we move away from upstream, more prblems it will create for
> > us going down the line.
>
> We don't move away from upstream. We just pack makedumpfile binaries
> into two packages. It's already done like that.
> > So I would still prefer that we pacakge these scripts as part of
> > kexec-tools as these are part of makeudmpfile upstream. And if need be
> > create a dependency on kexec-tools-eppic package during installation.
>
> I don't think putting these scripts into kexec-tools make sense. Because
> eppic support is more like a "plugin" for makedumpfile. Now we put
> eppic_makedumpfile.so in kexec-tools-eppic, we should put the sample
> scripts for this "plugin" all together with the "plugin". It doesn't
> sound right to me to seperate the sample eppic scripts and
> eppic_makedumpfile.so, because the sample eppic scripts standalone
> doesn't work and people have no idea what're these for.

Ok, so eppic_makedumpfile.so is also part of makedumpfile but we pack
it in a subpackage. And I think we did it because we did not want  to
bloat size of initramfs.

Given that eppic_makedumpfile.so will not be packed into initramfs
by default as makedumpfile does dlopen() and there are no dependencies
as shown by ldd, I think in long term it makes sense to remove 
kexec-tools-eppic package and pull everything into kexec-tools.

This will atleast remove some of the confusion. Upstream modle itself
is little strange. Source code for eepic comes from somewhere else and
actual library is generated by makedumpfile.

So in short term, I think I am fine with your approach of putting eepic
scripts in kexec-tools-eppic package. But in long term, let us do some
cleanup and get rid of kexec-tools-eppic package altogether.

Thanks
Vivek
> Thanks
> WANG Chao