bitbake.conf/base.bbclass: Drop PRINC support
RFC PATCH 1/1 bitbake.conf/base.bbclass: Drop PRINC support
PRINC is no longer needed since we have the PR service instead which people should be using. Drop the PRINC code.
---
meta/classes/base.bbclass +0 -12
@@ -455,18 +455,6 @@ python () { else: appendVar('EXTRA_OECONF', extraconf) - # If PRINC is set, try and increase the PR value by the amount specified - princ = d.getVar('PRINC', True) - if princ and princ != "0": - pr = d.getVar('PR', True) - pr_prefix = re.search("\D+",pr) - prval = re.search("\d+",pr) - if pr_prefix is None or prval is None: - bb.error("Unable to analyse format of PR variable: %s" % pr) - nval = int(prval.group(0)) + int(princ) - pr = pr_prefix.group(0) + str(nval) + pr[prval.end():] - d.setVar('PR', pr) - pn = d.getVar('PN', True) license = d.getVar('LICENSE', True) if license == "INVALID":
meta/conf/bitbake.conf +0 -1
@@ -188,7 +188,6 @@ 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_'][int(d.getVar('PE',1) or 0) > 0]}" P = "${PN}-${PV}"
Quoted 2 lines · Richard Purdie
PRINC is no longer needed since we have the PR service instead which people should be using. Drop the PRINC code.
Many layers are still using it and there wasn't enough of PV bumps to remove them :(.
Quoted 43 lines
Signed-off-by Richard Purdie <[email protected]>---
meta/classes/base.bbclass +0
-12@@ -455,18 +455,6 @@ python () { else: appendVar('EXTRA_OECONF', extraconf) - # If PRINC is set, try and increase the PR value by the amount specified - princ = d.getVar('PRINC', True) - if princ and princ != "0": - pr = d.getVar('PR', True) - pr_prefix = re.search("\D+",pr) - prval = re.search("\d+",pr) - if pr_prefix is None or prval is None: - bb.error("Unable to analyse format of PR variable: %s" % pr) - nval = int(prval.group(0)) + int(princ) - pr = pr_prefix.group(0) + str(nval) + pr[prval.end():] - d.setVar('PR', pr) - pn = d.getVar('PN', True) license = d.getVar('LICENSE', True) if license == "INVALID":meta/conf/bitbake.conf +0
-1@@ -188,7 +188,6 @@ 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_'][int(d.getVar('PE',1) or 0) > 0]}" P = "${PN}-${PV}"_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 2 lines · Richard Purdie
PRINC is no longer needed since we have the PR service instead which people should be using. Drop the PRINC code.
Will dropping this support break someone who is moving from a prior version of oe-core (i.e. will any of the PRs go backwards?)
--Mark
Quoted 44 lines
Signed-off-by Richard Purdie <[email protected]>---
meta/classes/base.bbclass +0
-12@@ -455,18 +455,6 @@ python () { else: appendVar('EXTRA_OECONF', extraconf) - # If PRINC is set, try and increase the PR value by the amount specified - princ = d.getVar('PRINC', True) - if princ and princ != "0": - pr = d.getVar('PR', True) - pr_prefix = re.search("\D+",pr) - prval = re.search("\d+",pr) - if pr_prefix is None or prval is None: - bb.error("Unable to analyse format of PR variable: %s" % pr) - nval = int(prval.group(0)) + int(princ) - pr = pr_prefix.group(0) + str(nval) + pr[prval.end():] - d.setVar('PR', pr) - pn = d.getVar('PN', True) license = d.getVar('LICENSE', True) if license == "INVALID":meta/conf/bitbake.conf +0
-1@@ -188,7 +188,6 @@ 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_'][int(d.getVar('PE',1) or 0) > 0]}" P = "${PN}-${PV}"_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 4 lines · Richard Purdie
PRINC is no longer needed since we have the PR service instead which people should be using. Drop the PRINC code.
Signed-off-by Richard Purdie <[email protected]>
Nack! Layers still use it. Please, delay removal for 1.7 and add a WARNING for 1.6.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Quoted 9 lines · Otavio Salvador
Quoted 4 lines · Richard Purdie
PRINC is no longer needed since we have the PR service instead which people should be using. Drop the PRINC code.
Signed-off-by Richard Purdie <[email protected]>Nack! Layers still use it. Please, delay removal for 1.7 and add a WARNING for 1.6.
I sent this out to test the situation, I don't think we can remove it for 1.6, we should add warnings though...
This is a reminder for layer maintainers using this to stop though! :)
Cheers,
Richard