diff options
author | Manuel Leonhardt <mleonhardt@arri.de> | 2021-11-02 20:14:30 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-15 11:56:16 +0000 |
commit | b9a58411fc976aca57a6b41dd5565d581db6789b (patch) | |
tree | b9053a58c15ab33f48f2ddecb08a93cc9954c2c7 /meta | |
parent | b0db46f667652df95cd1905ab947f190fb31b518 (diff) | |
download | poky-b9a58411fc976aca57a6b41dd5565d581db6789b.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: 37030893cdabdce935defc6f468309d8cd275e53)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 4 |
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 | ||
16 | PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" | 16 | PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" |
17 | 17 | ||
18 | export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}" | 18 | export PERL_LIBDIR = "${libdir}/perl5/${@get_perl_version(d)}" |
19 | PERL_LIBDIR:class-native = "${libdir}/perl-native/perl/${@get_perl_version(d)}" | 19 | PERL_LIBDIR:class-native = "${libdir}/perl-native/perl/${@get_perl_version(d)}" |
20 | 20 | ||
21 | EXTRA_OECONF = "\ | 21 | EXTRA_OECONF = "\ |
@@ -66,7 +66,7 @@ FILES:update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir} | |||
66 | RPROVIDES:update-alternatives-dpkg += "update-alternatives" | 66 | RPROVIDES:update-alternatives-dpkg += "update-alternatives" |
67 | 67 | ||
68 | PACKAGES += "${PN}-perl" | 68 | PACKAGES += "${PN}-perl" |
69 | FILES:${PN}-perl = "${libdir}/perl/${@get_perl_version(d)}" | 69 | FILES:${PN}-perl = "${libdir}/perl5/${@get_perl_version(d)}" |
70 | 70 | ||
71 | RDEPENDS:${PN}-perl += "perl-module-carp perl-module-constant \ | 71 | RDEPENDS:${PN}-perl += "perl-module-carp perl-module-constant \ |
72 | perl-module-cwd perl-module-digest \ | 72 | perl-module-cwd perl-module-digest \ |