From: Manuel Leonhardt Date: Tue, 2 Nov 2021 19:14:30 +0000 (+0100) Subject: dpkg: Install dkpg-perl scripts to versioned perl directory X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~6235 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdd4757ae057c7b3bfe27353fa25c4d7807a86ce;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git dpkg: Install dkpg-perl scripts to versioned perl directory Install dpkg-perl scripts to versioned perl directory, otherwise the following traceback happens when running, e.g. dpkg-architecture on the target: Can't locate Dpkg.pm in @INC (you may need to install the Dpkg module) (@INC contains: /usr/lib/perl5/site_perl/5.30.1/aarch64-linux /usr/lib/perl5/site_perl/5.30.1 /usr/lib/perl5/vendor_perl/5.30.1/aarch64-linux /usr/lib/perl5/vendor_perl/5.30.1 /usr/lib/perl5/5.30.1/aarch64-linux /usr/lib/perl5/5.30.1 .) at /usr/bin/dpkg-architecture line 25. Cc: Richard Purdie Signed-off-by: Manuel Leonhardt Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index b6807b004f3..74074cfdd7f 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -15,7 +15,7 @@ inherit autotools gettext perlnative pkgconfig perl-version update-alternatives PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" -export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}" +export PERL_LIBDIR = "${libdir}/perl5/${@get_perl_version(d)}" PERL_LIBDIR:class-native = "${libdir}/perl-native/perl/${@get_perl_version(d)}" EXTRA_OECONF = "\ @@ -66,7 +66,7 @@ FILES:update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir} RPROVIDES:update-alternatives-dpkg += "update-alternatives" PACKAGES += "${PN}-perl" -FILES:${PN}-perl = "${libdir}/perl/${@get_perl_version(d)}" +FILES:${PN}-perl = "${libdir}/perl5/${@get_perl_version(d)}" RDEPENDS:${PN}-perl += "perl-module-carp perl-module-constant \ perl-module-cwd perl-module-digest \