summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Leonhardt <mleonhardt@arri.de>2021-11-02 20:14:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-03 10:12:42 +0000
commit659b5540a60b6bc622e016e3199029f021031fef (patch)
tree1751d13f1b685924bd13128b6ba36e03e96e2b12
parent4c6efbf03530b6f60cde59cdef61aa14538753a3 (diff)
downloadpoky-659b5540a60b6bc622e016e3199029f021031fef.tar.gz
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> (From OE-Core rev: bdd4757ae057c7b3bfe27353fa25c4d7807a86ce) Signed-off-by: Manuel Leonhardt <mleonhardt@arri.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index b6807b004f..74074cfdd7 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
15 15
16PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" 16PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl"
17 17
18export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}" 18export PERL_LIBDIR = "${libdir}/perl5/${@get_perl_version(d)}"
19PERL_LIBDIR:class-native = "${libdir}/perl-native/perl/${@get_perl_version(d)}" 19PERL_LIBDIR:class-native = "${libdir}/perl-native/perl/${@get_perl_version(d)}"
20 20
21EXTRA_OECONF = "\ 21EXTRA_OECONF = "\
@@ -66,7 +66,7 @@ FILES:update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}
66RPROVIDES:update-alternatives-dpkg += "update-alternatives" 66RPROVIDES:update-alternatives-dpkg += "update-alternatives"
67 67
68PACKAGES += "${PN}-perl" 68PACKAGES += "${PN}-perl"
69FILES:${PN}-perl = "${libdir}/perl/${@get_perl_version(d)}" 69FILES:${PN}-perl = "${libdir}/perl5/${@get_perl_version(d)}"
70 70
71RDEPENDS:${PN}-perl += "perl-module-carp perl-module-constant \ 71RDEPENDS:${PN}-perl += "perl-module-carp perl-module-constant \
72 perl-module-cwd perl-module-digest \ 72 perl-module-cwd perl-module-digest \