summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>2020-12-11 17:28:18 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-09 09:17:16 +0000
commitb039c1da5026fdc97c0b898a2796a927b601da67 (patch)
tree3db6dc4864fa8088d9150361d3d2e238f14482cf
parent10d0a8f6014b95ce8ed1e7650755d7e37096a7fe (diff)
downloadpoky-b039c1da5026fdc97c0b898a2796a927b601da67.tar.gz
perl: fix installation failure because of shell issue
On one of my buildservers I noticed perl do_install failing with the following message: | rm: cannot remove '<OEROOT>/tmp-rpb-glibc/work/armv8-2a-linaro-linux/perl/5.32.0-r0/image//usr/lib/perl5/5.32.0/*/CORE/libperl.so': No such file or directory I tracked this down to shell being dash rather than bash not being able to expand this glob in the middle of the filename. So replace the glob expansion with the simpler one which works in all cases. (From OE-Core rev: 92cd97616f68dfd2fea2ad039c892d3faf1a0f32) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d1ea1b5c12120abdd085dc4eb69120af9258a99b) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/perl/perl_5.30.1.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb
index b53aff1216..ee6eb6ef0f 100644
--- a/meta/recipes-devtools/perl/perl_5.30.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.30.1.bb
@@ -146,8 +146,9 @@ do_install() {
146 install lib/ExtUtils/typemap ${D}${libdir}/perl5/${PV}/ExtUtils/ 146 install lib/ExtUtils/typemap ${D}${libdir}/perl5/${PV}/ExtUtils/
147 147
148 # Fix up shared library 148 # Fix up shared library
149 rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so 149 dir=$(echo ${D}/${libdir}/perl5/${PV}/*/CORE)
150 ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so 150 rm $dir/libperl.so
151 ln -sf ../../../../libperl.so.${PERL_LIB_VER} $dir/libperl.so
151} 152}
152 153
153do_install_append_class-target() { 154do_install_append_class-target() {