diff options
-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 170069460d..d020964a01 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -327,7 +327,7 @@ python () { | |||
327 | 327 | ||
328 | # If PRINC is set, try and increase the PR value by the amount specified | 328 | # If PRINC is set, try and increase the PR value by the amount specified |
329 | princ = bb.data.getVar('PRINC', d, True) | 329 | princ = bb.data.getVar('PRINC', d, True) |
330 | if princ: | 330 | if princ and princ != "0": |
331 | pr = bb.data.getVar('PR', d, True) | 331 | pr = bb.data.getVar('PR', d, True) |
332 | pr_prefix = re.search("\D+",pr) | 332 | pr_prefix = re.search("\D+",pr) |
333 | prval = re.search("\d+",pr) | 333 | prval = re.search("\d+",pr) |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b58cbef488..074a5c6080 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -171,6 +171,7 @@ ASSUME_PROVIDED = "\ | |||
171 | PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" | 171 | PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" |
172 | PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" | 172 | PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" |
173 | PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" | 173 | PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" |
174 | PRINC ?= "0" | ||
174 | PF = "${PN}-${EXTENDPE}${PV}-${PR}" | 175 | PF = "${PN}-${EXTENDPE}${PV}-${PR}" |
175 | EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" | 176 | EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" |
176 | P = "${PN}-${PV}" | 177 | P = "${PN}-${PV}" |