sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

rpm: brace expansion is a bashism 

The constuct rm *.{a,la} is a bashism and as tasks are run under /bin/sh this
may not work as expected.  Expand the {a,la} to two separate calls, and remove
the architecture-specific macro deletion as they are not installed in the first
place anymore.

(From OE-Core rev: 0edd06d15d2501ed0961681b56ecbb4ca5e75647)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2016-04-06 13:20:29 +01:00 committed by Richard Purdie
parent 66ecbd3405
commit 50f5ca3c60
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
View File

@ -568,16 +568,15 @@ do_install_append() {
rm -f ${D}/${mandir}/man1/lz*.1
rm -f ${D}/${libdir}/pkgconfig/liblzma*
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.{a,la}
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/rpm/*.{a,la}
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.a
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.la
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/rpm/*.a
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/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 ';'
# We don't want the default macro set
rm -rf ${D}/${libdir}/rpm/{i[3456]86*,athlon*,pentium*,x86_64*,alpha*,sparc*,ia64*,ppc*,s390*,armv[34][lb]*,armv[345]*,mips*,noarch*}
rm -f ${D}/${libdir}/rpm/dbconvert.sh
rm -f ${D}/${libdir}/rpm/libsqldb.*

9
meta/recipes-devtools/rpm/rpm_5.4.16.bb
View File

@ -576,16 +576,15 @@ do_install_append() {
rm -f ${D}/${mandir}/man1/lz*.1
rm -f ${D}/${libdir}/pkgconfig/liblzma*
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.{a,la}
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/rpm/*.{a,la}
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.a
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.la
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/rpm/*.a
rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/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 ';'
# We don't want the default macro set
rm -rf ${D}/${libdir}/rpm/{i[3456]86*,athlon*,pentium*,x86_64*,alpha*,sparc*,ia64*,ppc*,s390*,armv[34][lb]*,armv[345]*,mips*,noarch*}
rm -f ${D}/${libdir}/rpm/dbconvert.sh
rm -f ${D}/${libdir}/rpm/libsqldb.*