aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2017-08-22 16:13:17 +0800
committerArmin Kuster <akuster808@gmail.com>2017-09-13 17:16:28 -0700
commite55e74cfc47e0e2db592bbae27c60e282883a11d (patch)
tree9fb4ac1e8fd6ff8eb5bcd38462b745b2690b3bf7
parenta7ec9554700ca3993cda101e27d5a57bc39a1854 (diff)
downloadmeta-openembedded-e55e74cfc47e0e2db592bbae27c60e282883a11d.tar.gz
meta-openembedded-e55e74cfc47e0e2db592bbae27c60e282883a11d.tar.bz2
meta-openembedded-e55e74cfc47e0e2db592bbae27c60e282883a11d.zip
adduser: use get_perl_version instead of PERLVERSION
Immediate expansion for PERLVERSION(in perl-version.bbclass) is too early, it will result in 'None' before perl is built, then the module file is installed incorrectly: $ rpm -ql adduser|grep Common /usr/lib/perl/None/Debian/AdduserCommon.pm So use get_perl_version directly instead of PERLVERSION. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-perl/recipes-perl/adduser/adduser_3.115.bb3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta-perl/recipes-perl/adduser/adduser_3.115.bb b/meta-perl/recipes-perl/adduser/adduser_3.115.bb
index 81068d600..c21186231 100644
--- a/meta-perl/recipes-perl/adduser/adduser_3.115.bb
+++ b/meta-perl/recipes-perl/adduser/adduser_3.115.bb
@@ -22,8 +22,7 @@ do_install() {
install -m 0755 ${S}/adduser ${D}${sbindir}
install -m 0755 ${S}/deluser ${D}${sbindir}
- install -d ${D}${libdir}/perl/${PERLVERSION}/Debian
- install -m 0644 ${S}/AdduserCommon.pm ${D}${libdir}/perl/${PERLVERSION}/Debian
+ install -D -m 0644 ${S}/AdduserCommon.pm ${D}${libdir}/perl/${@get_perl_version(d)}/Debian/AdduserCommon.pm
sed -i -e "s/VERSION/${PV}/" ${D}${sbindir}/*
install -d ${D}/${sysconfdir}