From 661541fb67e2c368ecbe3e966daf878a2b48eae1 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Tue, 22 Aug 2017 16:13:17 +0800 Subject: 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 Signed-off-by: Martin Jansa --- meta-perl/recipes-perl/adduser/adduser_3.115.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta-perl/recipes-perl') diff --git a/meta-perl/recipes-perl/adduser/adduser_3.115.bb b/meta-perl/recipes-perl/adduser/adduser_3.115.bb index 81068d6007..c21186231f 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} -- cgit 1.2.3-korg