From 0edd06d15d2501ed0961681b56ecbb4ca5e75647 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 6 Apr 2016 13:20:29 +0100 Subject: 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 9 ++++----- meta/recipes-devtools/rpm/rpm_5.4.16.bb | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb index bacdef5242..c6c21b86aa 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb @@ -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.* diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index 7621f8ffaa..d42724c212 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb @@ -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.* -- cgit 1.2.3-korg