summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-12-02 18:39:04 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-05 16:16:12 (GMT)
commitf6da26f98254046a59983adf8e831bf1eeb9169f (patch)
tree37c8dc0c31ee1712d11d02e9a27ca484c348326d
parent2dfe16912168885be5901f35767db1d5c8eee4fc (diff)
downloadpoky-f6da26f98254046a59983adf8e831bf1eeb9169f.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.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 ea53498..fbcaefb 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -335,7 +335,7 @@ python () {
335 335
336 # If PRINC is set, try and increase the PR value by the amount specified 336 # If PRINC is set, try and increase the PR value by the amount specified
337 princ = d.getVar('PRINC', True) 337 princ = d.getVar('PRINC', True)
338 if princ: 338 if princ and princ != "0":
339 pr = d.getVar('PR', True) 339 pr = d.getVar('PR', True)
340 pr_prefix = re.search("\D+",pr) 340 pr_prefix = re.search("\D+",pr)
341 prval = re.search("\d+",pr) 341 prval = re.search("\d+",pr)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index acba388..e80cc32 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -167,6 +167,7 @@ ASSUME_PROVIDED = "\
167PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}" 167PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}"
168PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}" 168PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}"
169PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or 'r0'}" 169PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or 'r0'}"
170PRINC ?= "0"
170PF = "${PN}-${EXTENDPE}${PV}-${PR}" 171PF = "${PN}-${EXTENDPE}${PV}-${PR}"
171EXTENDPE = "${@['','${PE\x7d_'][d.getVar('PE',1) > 0]}" 172EXTENDPE = "${@['','${PE\x7d_'][d.getVar('PE',1) > 0]}"
172P = "${PN}-${PV}" 173P = "${PN}-${PV}"