From 61d6584eeadb42943a020c4168f398e7abb377e2 Mon Sep 17 00:00:00 2001 From: Awais Belal Date: Tue, 30 Mar 2021 12:29:22 +0500 Subject: perl: fix creation and generate new perl-rdepends.txt The creation of perl-rdepends.txt simply copied over the generated list (perl-rdepends.generated) to perl-rdepends.txt while missing out the manual dependencies placed in perl-rdepends.inc. This caused missing runtime dependencies. Additionally, the mechanism always appended which then produced duplicated lines in perl-rdepends.txt if the creation function is run multiple times. We now concatenate both the .inc and .generated to the final .txt so manual and generated both types of dependencies make it to the final configuration. A new perl-rdepends.txt is then generated with these fixes. Signed-off-by: Awais Belal Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/perl-rdepends.txt | 8 ++++++++ meta/recipes-devtools/perl/perl_5.32.1.bb | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/perl/files/perl-rdepends.txt b/meta/recipes-devtools/perl/files/perl-rdepends.txt index e7cd551988..f20fc44b58 100644 --- a/meta/recipes-devtools/perl/files/perl-rdepends.txt +++ b/meta/recipes-devtools/perl/files/perl-rdepends.txt @@ -1,3 +1,11 @@ + +# Some additional dependencies that the above doesn't manage to figure out +RDEPENDS_perl-module-file-spec += "perl-module-file-spec-unix" +RDEPENDS_perl-module-math-bigint += "perl-module-math-bigint-calc" +RDEPENDS_perl-module-thread-queue += "perl-module-attributes" +RDEPENDS_perl-module-overload += "perl-module-overloading" + +# Generated depends list beyond this line RDEPENDS_perl-module-anydbm-file += "perl-module-strict" RDEPENDS_perl-module-anydbm-file += "perl-module-warnings" RDEPENDS_perl-module-app-cpan += "perl-module-config" diff --git a/meta/recipes-devtools/perl/perl_5.32.1.bb b/meta/recipes-devtools/perl/perl_5.32.1.bb index 65db6da2b5..b28040c7fb 100644 --- a/meta/recipes-devtools/perl/perl_5.32.1.bb +++ b/meta/recipes-devtools/perl/perl_5.32.1.bb @@ -370,8 +370,8 @@ EOPREAMBLE sort -u | \ sed 's/^/RDEPENDS_/;s/perl-module-/${PN}-module-/g;s/module-\(module-\)/\1/g;s/\(module-load\)-conditional/\1/g;s/encode-configlocal/&-pm/;' | \ egrep -wv '=>|module-a|module-apache.?|module-apr|module-authen-sasl|module-b-asmdata|module-convert-ebcdic|module-devel-size|module-digest-perl-md5|module-dumpvalue|module-extutils-constant-aaargh56hash|module-extutils-xssymset|module-file-bsdglob|module-for|module-it|module-io-socket-inet6|module-io-socket-ssl|module-io-string|module-ipc-system-simple|module-lexical|module-local-lib|metadata|module-modperl-util|module-pluggable-object|module-test-builder-io-scalar|module-test2|module-text-unidecode|module-unicore|module-win32|objects\sload|syscall.ph|systeminfo.ph|%s' | \ - egrep -wv '=>|module-algorithm-diff|module-carp|module-c|module-encode-hanextra|module-extutils-makemaker-version-regex|module-file-spec|module-io-compress-lzma|module-locale-maketext-lexicon|module-log-agent|module-meta-notation|module-net-localcfg|module-net-ping-external|module-b-deparse|module-scalar-util|module-some-module|module-symbol|module-uri|module-win32api-file' >> ${WORKDIR}/perl-rdepends.generated - cp ${WORKDIR}/perl-rdepends.generated ${THISDIR}/files/perl-rdepends.txt + egrep -wv '=>|module-algorithm-diff|module-carp|module-c|module-l|module-encode-hanextra|module-extutils-makemaker-version-regex|module-file-spec|module-io-compress-lzma|module-io-uncompress-unxz|module-locale-maketext-lexicon|module-log-agent|module-meta-notation|module-net-localcfg|module-net-ping-external|module-b-deparse|module-scalar-util|module-some-module|module-symbol|module-uri|module-win32api-file' > ${WORKDIR}/perl-rdepends.generated + cat ${WORKDIR}/perl-rdepends.inc ${WORKDIR}/perl-rdepends.generated > ${THISDIR}/files/perl-rdepends.txt } # bitbake perl -c create_rdepends_inc -- cgit 1.2.3-korg