[oe-commits] [meta-openembedded] 45/74: adduser: use get_perl_version instead of PERLVERSION

git at git.openembedded.org git at git.openembedded.org
Mon Aug 28 09:05:05 UTC 2017


This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master
in repository meta-openembedded.

commit 661541fb67e2c368ecbe3e966daf878a2b48eae1
Author: Jackie Huang <jackie.huang at windriver.com>
AuthorDate: Tue Aug 22 16:13:17 2017 +0800

    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 at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-perl/recipes-perl/adduser/adduser_3.115.bb | 3 +--
 1 file changed, 1 insertion(+), 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 81068d6..c211862 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}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list