diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-06 13:20:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-09 23:00:45 +0100 |
commit | 50f5ca3c607c3e60bf6d3a431b24d46023310ddb (patch) | |
tree | a16e88614b926fc32e82b21510fa4b00f00aa643 /meta/recipes-devtools/rpm/rpm_5.4.16.bb | |
parent | 66ecbd3405b94ff051f9a69936f4387e9a973a86 (diff) | |
download | poky-50f5ca3c607c3e60bf6d3a431b24d46023310ddb.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm_5.4.16.bb')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.16.bb | 9 |
1 files changed, 4 insertions, 5 deletions
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() { | |||
576 | rm -f ${D}/${mandir}/man1/lz*.1 | 576 | rm -f ${D}/${mandir}/man1/lz*.1 |
577 | rm -f ${D}/${libdir}/pkgconfig/liblzma* | 577 | rm -f ${D}/${libdir}/pkgconfig/liblzma* |
578 | 578 | ||
579 | rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.{a,la} | 579 | rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.a |
580 | rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/rpm/*.{a,la} | 580 | rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.la |
581 | rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/rpm/*.a | ||
582 | rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/rpm/*.la | ||
581 | 583 | ||
582 | #find ${D}/${libdir}/perl5 -type f -a \( -name perllocal.pod -o -name .packlist \ | 584 | #find ${D}/${libdir}/perl5 -type f -a \( -name perllocal.pod -o -name .packlist \ |
583 | # -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' | 585 | # -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' |
584 | #find ${D}/${libdir}/perl5 -type d -depth -exec rmdir {} 2>/dev/null ';' | 586 | #find ${D}/${libdir}/perl5 -type d -depth -exec rmdir {} 2>/dev/null ';' |
585 | 587 | ||
586 | # We don't want the default macro set | ||
587 | rm -rf ${D}/${libdir}/rpm/{i[3456]86*,athlon*,pentium*,x86_64*,alpha*,sparc*,ia64*,ppc*,s390*,armv[34][lb]*,armv[345]*,mips*,noarch*} | ||
588 | |||
589 | rm -f ${D}/${libdir}/rpm/dbconvert.sh | 588 | rm -f ${D}/${libdir}/rpm/dbconvert.sh |
590 | 589 | ||
591 | rm -f ${D}/${libdir}/rpm/libsqldb.* | 590 | rm -f ${D}/${libdir}/rpm/libsqldb.* |