From f6da26f98254046a59983adf8e831bf1eeb9169f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 2 Dec 2011 19:39:04 +0100 Subject: bitbake.conf: add default PRINC 0 to be able to increment it (From OE-Core rev: 656793c706d84460f397b10ceb23ebb721ed3960) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 2 +- meta/conf/bitbake.conf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index ea5349852b..fbcaefb4dd 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -335,7 +335,7 @@ python () { # If PRINC is set, try and increase the PR value by the amount specified princ = d.getVar('PRINC', True) - if princ: + if princ and princ != "0": pr = d.getVar('PR', True) pr_prefix = re.search("\D+",pr) prval = re.search("\d+",pr) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index acba388226..e80cc32b7d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -167,6 +167,7 @@ ASSUME_PROVIDED = "\ PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or 'r0'}" +PRINC ?= "0" PF = "${PN}-${EXTENDPE}${PV}-${PR}" EXTENDPE = "${@['','${PE\x7d_'][d.getVar('PE',1) > 0]}" P = "${PN}-${PV}" -- cgit v1.2.3-54-g00ecf