From 80cae8d03640155614b3074b6ccc4fd5dc19cbd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 21 Oct 2013 11:03:41 +0200 Subject: [PATCH] angstrom.inc: set dummy default MACHINE_KERNEL_PR to "r0" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit machines not using MACHINE_KERNEL_PR would fail for recipes appending letters (meta-ti) with: ERROR: Unable to analyse format of PR variable: b############# | ETA: 00:00:40 ERROR: Error executing a python function in : The stack trace of python calls that resulted in this exception/failure was: File: '', lineno: 1, function: *** 0001:__anon_629__home_a_mueller_oe_core_sources_openembedded_core_meta_classes_base_bbclass(d) 0002:__anon_975__home_a_mueller_oe_core_sources_openembedded_core_meta_classes_insane_bbclass(d) 0003:__anon_235__home_a_mueller_oe_core_sources_openembedded_core_meta_classes_package_bbclass(d) 0004:__anon_20__home_a_mueller_oe_core_sources_openembedded_core_meta_classes_debian_bbclass(d) 0005:__anon_45__home_a_mueller_oe_core_sources_openembedded_core_meta_classes_blacklist_bbclass(d) File: '__anon_629__home_a_mueller_oe_core_sources_openembedded_core_meta_classes_base_bbclass', lineno: 80, function: __anon_629__home_a_mueller_oe_core_sources_openembedded_core_meta_classes_base_bbclass 0076: pr_prefix = re.search("\D+",pr) 0077: prval = re.search("\d+",pr) 0078: if pr_prefix is None or prval is None: 0079: bb.error("Unable to analyse format of PR variable: %s" % pr) *** 0080: nval = int(prval.group(0)) + int(princ) 0081: pr = pr_prefix.group(0) + str(nval) + pr[prval.end():] 0082: d.setVar('PR', pr) 0083: 0084: pn = d.getVar('PN', True) Exception: AttributeError: 'NoneType' object has no attribute 'group' ERROR: Failed to parse recipe: /home/a.mueller/oe-core/sources/meta-ti/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.05.00.03.bb Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi --- conf/distro/include/angstrom.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 1dfc610..956f53d 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -122,7 +122,7 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc # # so for machines which do not define it lets define it to be empty -MACHINE_KERNEL_PR ??= "" +MACHINE_KERNEL_PR ??= "r0" # We don't want to keep OABI compat ARM_KEEP_OABI = "0"