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:39:04 +0000 |
| commit | 32f0ad32d901ae5a97d912d8d36d4d9a2b502919 (patch) | |
| tree | e8ccfcf5f768a7db67d1299f89aabcf17a20c238 | |
| parent | 8f616810b868a30fc01550c017f9fc14220ae7d8 (diff) | |
| download | openembedded-core-32f0ad32d901ae5a97d912d8d36d4d9a2b502919.tar.gz | |
bitbake.conf: add default PRINC 0 to be able to increment it
(From OE-Core rev: 656793c706d84460f397b10ceb23ebb721ed3960)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 () { # If PRINC is set, try and increase the PR value by the amount specified princ = bb.data.getVar('PRINC', d, True) - if princ: + if princ and princ != "0": pr = bb.data.getVar('PR', d, 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 b58cbef488..074a5c6080 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -171,6 +171,7 @@ ASSUME_PROVIDED = "\ PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" +PRINC ?= "0" PF = "${PN}-${EXTENDPE}${PV}-${PR}" EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" P = "${PN}-${PV}" |