diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2011-12-02 19:39:04 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-05 16:08:56 +0000 |
| commit | 656793c706d84460f397b10ceb23ebb721ed3960 (patch) | |
| tree | 2f07a27a5f13730d371e5aa606667c3209f061ea /meta | |
| parent | ddb8d3de34f809b9c72eb3a2223a74f75eff7911 (diff) | |
| download | openembedded-core-656793c706d84460f397b10ceb23ebb721ed3960.tar.gz openembedded-core-656793c706d84460f397b10ceb23ebb721ed3960.tar.bz2 openembedded-core-656793c706d84460f397b10ceb23ebb721ed3960.zip | |
bitbake.conf: add default PRINC 0 to be able to increment it
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 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}" |