Skip to contentSkip to conversation

cpan-base: Add vardepvalue to get_perl_version function

PATCH Superseded Martin Jansa 1 participant 3 messages Nov 29, 2013 – Dec 4, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpan-base: Add vardepvalue to get_perl_version function

* without this bitbake -S perf shows following error:
ERROR: Bitbake's cached basehash does not match the one we just generated
(/OE/oe-core/meta/recipes-kernel/perf/perf.bb.do_package)!
if you run it twice, once without perl in sysroot and once with perl already built

---
 meta/classes/cpan-base.bbclass | 3 +++
 1 file changed, 3 insertions(+)
meta/classes/cpan-base.bbclass +3 -0
index 7e1e8d0..609fde6 100644
@@ -10,6 +10,9 @@ 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] = "${STAGING_LIBDIR}${PERL_OWN_DIR}"
 def get_perl_version(d):
     import re
     cfg = d.expand('${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/config.sh')
Signature · 1 line
1.8.4.3
#1 lore raw
Quoted 16 lines · Martin Jansa

* without this bitbake -S perf shows following error:
ERROR: Bitbake's cached basehash does not match the one we just generated
(/OE/oe-core/meta/recipes-kernel/perf/perf.bb.do_package)!
if you run it twice, once without perl in sysroot and once with perl already built

---
 meta/classes/cpan-base.bbclass | 3 +++
 1 file changed, 3 insertions(+)
meta/classes/cpan-base.bbclass +0 -0
index 7e1e8d0..609fde6 100644

meta/classes/cpan-base.bbclass RDEPENDS_${PN} += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" · line 15

Quoted 6 lines
meta/classes/cpan-base.bbclass +3 -0
@@ -10,6 +10,9 @@ 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] = "${STAGING_LIBDIR}${PERL_OWN_DIR}"

Sorry, this isn't correct, it includes whole path to STAGING_LIBDIR in signature (different for each MACHINE).

v2 coming soon

Quoted 6 lines
meta/classes/cpan-base.bbclass +0 -0
 def get_perl_version(d):
     import re
     cfg = d.expand('${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/config.sh')
Signature · 1 line
1.8.4.3
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw

PATCH v2 1/1 cpan-base: Add vardepvalue to get_perl_version function

* without this bitbake -S perf shows following error:
ERROR: Bitbake's cached basehash does not match the one we just generated
(/OE/oe-core/meta/recipes-kernel/perf/perf.bb.do_package)!
if you run it twice, once without perl in sysroot and once with perl already built

---
 meta/classes/cpan-base.bbclass | 3 +++
 1 file changed, 3 insertions(+)
meta/classes/cpan-base.bbclass +3 -0
index 7e1e8d0..aa502d5 100644
@@ -10,6 +10,9 @@ 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')
Signature · 1 line
1.8.4.3