summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-12-02 19:39:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-05 16:16:12 +0000
commitf6da26f98254046a59983adf8e831bf1eeb9169f (patch)
tree37c8dc0c31ee1712d11d02e9a27ca484c348326d
parent2dfe16912168885be5901f35767db1d5c8eee4fc (diff)
downloadpoky-f6da26f98254046a59983adf8e831bf1eeb9169f.tar.gz
poky-f6da26f98254046a59983adf8e831bf1eeb9169f.tar.bz2
poky-f6da26f98254046a59983adf8e831bf1eeb9169f.zip
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.bbclass2
-rw-r--r--meta/conf/bitbake.conf1
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}"