[OE-core] [PATCH] rpm: remove redundant removals

[Burton, Ross]

On 8 September 2016 at 20:19, Mark Hatle <mark.hatle at windriver.com> wrote:

> > -     rm -f ${D}/${mandir}/man8/rpmcache.8*
> > -     rm -f ${D}/${mandir}/man8/rpmgraph.8*
> > -     rm -f ${D}/${mandir}/*/man8/rpmcache.8*
> > -     rm -f ${D}/${mandir}/*/man8/rpmgraph.8*
> > -     rm -rf ${D}/${mandir}/{fr,ko}
>
> Above cases need to be removed.  We do not support the rpmcache or
> rpmgraph, and
> at least for a long time the man pages were being generated for them.  (If
> this
> is no longer true, and man pages ARE being generated they should be
> removed.)


These manpages are not installed in the first place.

> -     rm -f ${D}/${includedir}/popt.h
> > -     rm -f ${D}/${libdir}/libpopt.*
> > -     rm -f ${D}/${libdir}/pkgconfig/popt.pc
> > -     rm -f ${D}/${datadir}/locale/*/LC_MESSAGES/popt.mo
> > -     rm -f ${D}/${mandir}/man3/popt.3
>
> We can use either an internal or external version of the popt library.  If
> the
> internal version is used, we MUST remove all of these files.  If the
> external
> version is used, the RPM won't end up doing anything.


Okay, restored.


> > -     rm -f ${D}/${mandir}/man1/xar.1*
> > -     rm -f ${D}/${bindir}/xar
> > -     rm -rf ${D}/${includedir}/xar
> > -     rm -f ${D}/${libdir}/libxar*
>

xar is a PACKAGECONFIG which is disabled by default, so removing the files
if it is enabled seems wrong.


> > -     rm -f ${D}/${bindir}/lz*
> > -     rm -f ${D}/${bindir}/unlzma
> > -     rm -f ${D}/${bindir}/unxz
> > -     rm -f ${D}/${bindir}/xz*
> > -     rm -rf ${D}/${includedir}/lzma*
> > -     rm -f ${D}/${mandir}/man1/lz*.1
> > -     rm -f ${D}/${libdir}/pkgconfig/liblzma*
>
> Above files may be generated in some configurations.  (Possible that is no
> longer true.


Doesn't appear to be true any more: rpm links to an external xz.


>  > -     rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/*.a

>       rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/*.la
> > -     rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/rpm/*.a
> >       rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/rpm/*.la
>
> The .a files were removed because we didn't want anyone statically linking
> to
> python.a, not sure they they were being produced to begin with.. but that
> is why
> that was there.


Nothing is installing these but I suspect this is a side-effect of Poky's
no-static-libs change, so I'll remove this.

> -     rm -f ${D}/${libdir}/rpm/libsqldb.*
> > -
>
> If 'sqlite' support is enabled in RPM, the above should be removed.  It
> will
> clash with external components.


Done.


>
> > -     # We don't want, nor need the Mandriva multiarch items
> > -     rm -f ${D}/${bindir}/multiarch-dispatch
> > -     rm -f ${D}/${bindir}/multiarch-platform
> > -     rm -f ${D}/${libdir}/rpm/check-multiarch-files
> > -     rm -f ${D}/${libdir}/rpm/mkmultiarch
> > -     rm -f ${D}/${includedir}/multiarch-dispatch.h
> > -
>
> Again, some configs may produce these.. if they're not produced in our
> config we
> can remove it.


Not anymore apparently:

noinst_SCRIPTS += multiarch-dispatch multiarch-platform
noinst_SCRIPTS += check-multiarch-files mkmultiarch
noinst_HEADERS = multiarch-dispatch.h


> >       rm -f ${D}/${libdir}/rpm/gstreamer.sh
> >       rm -f ${D}/${libdir}/rpm/gem_helper.rb
> >       rm -f ${D}/${libdir}/rpm/rubygems.rb
> > @@ -610,12 +567,10 @@ do_install_append() {
> >       rm -f ${D}/${libdir}/rpm/macros.d/kernel
> >       rm -f ${D}/${libdir}/rpm/macros.d/gstreamer
> >       rm -f ${D}/${libdir}/rpm/bin/mgo
> > -     rm -f ${D}/${libdir}/rpm/bin/dbconvert
>
> dbconvert is not useful for us.. it used to be provided, so we removed it.


This doesn't get installed anymore.

V2 incoming.

Ross
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160912/697b08df/attachment-0002.html>