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 <richard.purdie@linuxfoundation.org>
Signed-off-by: Manuel Leonhardt <mleonhardt@arri.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit bdd4757ae057c7b3bfe27353fa25c4d7807a86ce)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index b6807b004f36c274ff4386f5e96c7921e9a628cc..74074cfdd7fb234e2c7b4c56e3f7ca6f91b69604 100644 (file)
--- 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 \