diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/base.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index ea5349852..fbcaefb4d 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 acba38822..e80cc32b7 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}" |