diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2011-12-02 19:39:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:43:44 +0000 |
commit | 935678cbe172f6c9a70ac293d8d19dc64ce0b38f (patch) | |
tree | db23b902c7c91003e263d2e6269d35778cd64fbf /meta | |
parent | ee75b5020b3fb70028f3e4653135b1cae754bd20 (diff) | |
download | poky-935678cbe172f6c9a70ac293d8d19dc64ce0b38f.tar.gz |
bitbake.conf: add default PRINC 0 to be able to increment it
(From OE-Core rev: 656793c706d84460f397b10ceb23ebb721ed3960)
(From OE-Core rev: 32f0ad32d901ae5a97d912d8d36d4d9a2b502919)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 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}" |