[oe-commits] [openembedded-core] 01/34: cpan-base.bbclass: Move PERLVERSION and get_perl_version to a new file

[git at git.openembedded.org]

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

rpurdie pushed a commit to branch pyro
in repository openembedded-core.

commit 6907280335dd47f2fd3a3f4cf809357c3caff65d
Author: Tom Rini <trini at konsulko.com>
AuthorDate: Sun Jun 11 08:36:31 2017 -0400

    cpan-base.bbclass: Move PERLVERSION and get_perl_version to a new file
    
    It is possible for non-CPAN recipes to contain perl modules.  These perl
    modules must reside in the versioned perl library directory in order to
    work in normal circumstances..  Export this logic to a separate class so
    that it can be reused without the rest of the cpan logic.
    
    Without this, dpkg will not export its perl code to the correct location
    and will not be found by utilities that expect to use it.
    
    Signed-off-by: Tom Rini <trini at konsulko.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/cpan-base.bbclass                     | 24 +---------------------
 .../{cpan-base.bbclass => perl-version.bbclass}    | 16 ---------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index 55ac052..577fcd6 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -7,27 +7,7 @@ FILES_${PN} += "${libdir}/perl ${datadir}/perl"
 DEPENDS  += "${@["perl", "perl-native"][(bb.data.inherits_class('native', d))]}"
 RDEPENDS_${PN} += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
 
-PERL_OWN_DIR = "${@["", "/perl-native"][(bb.data.inherits_class('native', d))]}"
-
-# Determine the staged version of perl from the perl configuration file
-# Assign vardepvalue, because otherwise signature is changed before and after
-# perl is built (from None to real version in config.sh).
-get_perl_version[vardepvalue] = "${PERL_OWN_DIR}"
-def get_perl_version(d):
-    import re
-    cfg = d.expand('${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/config.sh')
-    try:
-        f = open(cfg, 'r')
-    except IOError:
-        return None
-    l = f.readlines();
-    f.close();
-    r = re.compile("^version='(\d*\.\d*\.\d*)'")
-    for s in l:
-        m = r.match(s)
-        if m:
-            return m.group(1)
-    return None
+inherit perl-version
 
 def is_target(d):
     if not bb.data.inherits_class('native', d):
@@ -36,5 +16,3 @@ def is_target(d):
 
 PERLLIBDIRS = "${libdir}/perl"
 PERLLIBDIRS_class-native = "${libdir}/perl-native"
-PERLVERSION := "${@get_perl_version(d)}"
-PERLVERSION[vardepvalue] = ""
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/perl-version.bbclass
similarity index 61%
copy from meta/classes/cpan-base.bbclass
copy to meta/classes/perl-version.bbclass
index 55ac052..fafe68a 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/perl-version.bbclass
@@ -1,12 +1,3 @@
-#
-# cpan-base providers various perl related information needed for building
-# cpan modules
-#
-FILES_${PN} += "${libdir}/perl ${datadir}/perl"
-
-DEPENDS  += "${@["perl", "perl-native"][(bb.data.inherits_class('native', d))]}"
-RDEPENDS_${PN} += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
-
 PERL_OWN_DIR = "${@["", "/perl-native"][(bb.data.inherits_class('native', d))]}"
 
 # Determine the staged version of perl from the perl configuration file
@@ -29,12 +20,5 @@ def get_perl_version(d):
             return m.group(1)
     return None
 
-def is_target(d):
-    if not bb.data.inherits_class('native', d):
-        return "yes"
-    return "no"
-
-PERLLIBDIRS = "${libdir}/perl"
-PERLLIBDIRS_class-native = "${libdir}/perl-native"
 PERLVERSION := "${@get_perl_version(d)}"
 PERLVERSION[vardepvalue] = ""

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