* [PATCH] rpm: remove redundant removals
@ 2016-09-12 14:53 Ross Burton
0 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2016-09-12 14:53 UTC (permalink / raw)
To: openembedded-core
These were noticed by the use of bashisms (rm *.{foo,bar}) and lots of these rm
commands are deleting files which don't exist in the first place.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-devtools/rpm/rpm_5.4.16.bb | 37 ---------------------------------
1 file changed, 37 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index 9f78dee..ee300a0 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -554,54 +554,19 @@ do_install_append() {
install -m 0755 ${WORKDIR}/pythondeps.sh ${D}/${libdir}/rpm/pythondeps.sh
install -m 0755 ${WORKDIR}/perfile_rpmdeps.sh ${D}/${libdir}/rpm/perfile_rpmdeps.sh
- # Remove unpackaged files (based on list in rpm.spec)
- rm -f ${D}/${libdir}/rpm/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req,trpm}
-
- 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}
-
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
- rm -f ${D}/${mandir}/man1/xar.1*
- rm -f ${D}/${bindir}/xar
- rm -rf ${D}/${includedir}/xar
- rm -f ${D}/${libdir}/libxar*
-
- 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*
-
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
- #find ${D}/${libdir}/perl5 -type f -a \( -name perllocal.pod -o -name .packlist \
- # -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
- #find ${D}/${libdir}/perl5 -type d -depth -exec rmdir {} 2>/dev/null ';'
-
- rm -f ${D}/${libdir}/rpm/dbconvert.sh
-
rm -f ${D}/${libdir}/rpm/libsqldb.*
- # 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
-
rm -f ${D}/${libdir}/rpm/gstreamer.sh
rm -f ${D}/${libdir}/rpm/gem_helper.rb
rm -f ${D}/${libdir}/rpm/rubygems.rb
@@ -610,12 +575,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
rm -f ${D}/${libdir}/rpm/bin/pom2spec
rm -rf ${D}/var/lib/wdj ${D}/var/cache/wdj
rm -f ${D}/${libdir}/rpm/bin/api-sanity-checker.pl
-
}
do_install_append_class-target() {
--
2.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] rpm: remove redundant removals
@ 2016-09-08 19:04 Ross Burton
2016-09-08 19:19 ` Mark Hatle
0 siblings, 1 reply; 4+ messages in thread
From: Ross Burton @ 2016-09-08 19:04 UTC (permalink / raw)
To: openembedded-core
These were noticed by the use of bashisms (rm *.{foo,bar}) and lots of these rm
commands are deleting files which don't exist in the first place.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-devtools/rpm/rpm_5.4.16.bb | 45 ---------------------------------
1 file changed, 45 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index 9f78dee..2b8768c 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -554,54 +554,11 @@ do_install_append() {
install -m 0755 ${WORKDIR}/pythondeps.sh ${D}/${libdir}/rpm/pythondeps.sh
install -m 0755 ${WORKDIR}/perfile_rpmdeps.sh ${D}/${libdir}/rpm/perfile_rpmdeps.sh
- # Remove unpackaged files (based on list in rpm.spec)
- rm -f ${D}/${libdir}/rpm/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req,trpm}
-
- 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}
-
- 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
-
- rm -f ${D}/${mandir}/man1/xar.1*
- rm -f ${D}/${bindir}/xar
- rm -rf ${D}/${includedir}/xar
- rm -f ${D}/${libdir}/libxar*
-
- 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*
-
- 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
- #find ${D}/${libdir}/perl5 -type f -a \( -name perllocal.pod -o -name .packlist \
- # -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
- #find ${D}/${libdir}/perl5 -type d -depth -exec rmdir {} 2>/dev/null ';'
-
rm -f ${D}/${libdir}/rpm/dbconvert.sh
- rm -f ${D}/${libdir}/rpm/libsqldb.*
-
- # 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
-
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
rm -f ${D}/${libdir}/rpm/bin/pom2spec
rm -rf ${D}/var/lib/wdj ${D}/var/cache/wdj
rm -f ${D}/${libdir}/rpm/bin/api-sanity-checker.pl
-
}
do_install_append_class-target() {
--
2.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] rpm: remove redundant removals
2016-09-08 19:04 Ross Burton
@ 2016-09-08 19:19 ` Mark Hatle
2016-09-12 14:51 ` Burton, Ross
0 siblings, 1 reply; 4+ messages in thread
From: Mark Hatle @ 2016-09-08 19:19 UTC (permalink / raw)
To: Ross Burton, openembedded-core
On 9/8/16 2:04 PM, Ross Burton wrote:
> These were noticed by the use of bashisms (rm *.{foo,bar}) and lots of these rm
> commands are deleting files which don't exist in the first place.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> meta/recipes-devtools/rpm/rpm_5.4.16.bb | 45 ---------------------------------
> 1 file changed, 45 deletions(-)
>
> diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
> index 9f78dee..2b8768c 100644
> --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
> +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
> @@ -554,54 +554,11 @@ do_install_append() {
> install -m 0755 ${WORKDIR}/pythondeps.sh ${D}/${libdir}/rpm/pythondeps.sh
> install -m 0755 ${WORKDIR}/perfile_rpmdeps.sh ${D}/${libdir}/rpm/perfile_rpmdeps.sh
>
> - # Remove unpackaged files (based on list in rpm.spec)
> - rm -f ${D}/${libdir}/rpm/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req,trpm}
The above files can 'appear' in some odd cases. But likely it is safe to remove
the 'rm'.
> - 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.)
> - 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.
> - rm -f ${D}/${mandir}/man1/xar.1*
> - rm -f ${D}/${bindir}/xar
> - rm -rf ${D}/${includedir}/xar
> - rm -f ${D}/${libdir}/libxar*
> -
> - 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.)
> - 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.
> - #find ${D}/${libdir}/perl5 -type f -a \( -name perllocal.pod -o -name .packlist \
> - # -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
> - #find ${D}/${libdir}/perl5 -type d -depth -exec rmdir {} 2>/dev/null ';'
> -
Don't know what the above is.
> rm -f ${D}/${libdir}/rpm/dbconvert.sh
>
> - rm -f ${D}/${libdir}/rpm/libsqldb.*
> -
If 'sqlite' support is enabled in RPM, the above should be removed. It will
clash with external components.
> - # 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.
> 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.
> rm -f ${D}/${libdir}/rpm/bin/pom2spec
>
> rm -rf ${D}/var/lib/wdj ${D}/var/cache/wdj
> rm -f ${D}/${libdir}/rpm/bin/api-sanity-checker.pl
> -
> }
>
> do_install_append_class-target() {
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] rpm: remove redundant removals
2016-09-08 19:19 ` Mark Hatle
@ 2016-09-12 14:51 ` Burton, Ross
0 siblings, 0 replies; 4+ messages in thread
From: Burton, Ross @ 2016-09-12 14:51 UTC (permalink / raw)
To: Mark Hatle; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 3767 bytes --]
On 8 September 2016 at 20:19, Mark Hatle <mark.hatle@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
[-- Attachment #2: Type: text/html, Size: 6544 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-12 14:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-12 14:53 [PATCH] rpm: remove redundant removals Ross Burton
-- strict thread matches above, loose matches on Subject: below --
2016-09-08 19:04 Ross Burton
2016-09-08 19:19 ` Mark Hatle
2016-09-12 14:51 ` Burton, Ross
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox