diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2011-12-22 15:29:11 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-11 10:37:43 +0000 |
commit | a05e3a57c6f567578faeb31fae89b20e22850af4 (patch) | |
tree | 0fb66b3c74a9c011190179f0004024be5927570c /meta/conf | |
parent | 6bde156c5ce58c8e55cd6f5fd5f87982a919ba34 (diff) | |
download | poky-a05e3a57c6f567578faeb31fae89b20e22850af4.tar.gz |
meta/PRService: Added export/import fuctions.
[YOCTO #1556]
- Modified meta/class/package.bbclass and prserv.bbclass according to
the change in PR service by adding PACKAGE_ARCH into the query tuple.
- Added prexport.bbclass, primport.bbclass to export/import AUTOPR
values from/to PRService.
- Move PR service related common code to lib/oe/prservice.py.
- Supported reading the AUTOPR values from the exported .inc file
instead of reading it from remote PR service.
- Created a new script bitbake-prserv-tool to export/import the AUTOPR
values from/to the PR service.
Typical usage scenario of the export/import is:
1. bitbake-prserv-tool export <file> to export the AUTOPR values from
the current PR service into an exported .inc file.
2. Others may use that exported .inc file(to be included in the
local.conf) to lockdown and reproduce the same AUTOPR when generating
package feeds.
3. Others may "bitbake-prserv-tool import <file>" to import the AUTOPR
values into their own PR service and the AUTOPR values will be
incremented from there.
(From OE-Core rev: 9979107d8eaf503efd921564385859b1e83dbb3c)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
-rw-r--r-- | meta/conf/prexport.conf | 1 | ||||
-rw-r--r-- | meta/conf/primport.conf | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 336b1d7062..43eedad046 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -190,7 +190,7 @@ BP = "${BPN}-${PV}" | |||
190 | # | 190 | # |
191 | # network based PR service | 191 | # network based PR service |
192 | # | 192 | # |
193 | USE_PR_SERV = "${@[1,0][(d.getVar('PRSERV_HOST',1) is None) or (d.getVar('PRSERV_PORT',1) is None)]}" | 193 | USE_PR_SERV = "${@[1,0][((not d.getVar('PRSERV_HOST', True)) or (not d.getVar('PRSERV_PORT', True))) and (not d.getVar('PRSERV_LOCKDOWN', True))]}" |
194 | 194 | ||
195 | # Package info. | 195 | # Package info. |
196 | 196 | ||
@@ -732,7 +732,7 @@ BB_CONSOLELOG = "${TMPDIR}/cooker.log.${DATETIME}" | |||
732 | # Setup our default hash policy | 732 | # Setup our default hash policy |
733 | BB_SIGNATURE_HANDLER ?= "basic" | 733 | BB_SIGNATURE_HANDLER ?= "basic" |
734 | BB_HASHTASK_WHITELIST ?= "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)" | 734 | BB_HASHTASK_WHITELIST ?= "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)" |
735 | BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE" | 735 | BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST PRSERV_PORT PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN" |
736 | 736 | ||
737 | MLPREFIX ??= "" | 737 | MLPREFIX ??= "" |
738 | MULTILIB_VARIANTS ??= "" | 738 | MULTILIB_VARIANTS ??= "" |
diff --git a/meta/conf/prexport.conf b/meta/conf/prexport.conf new file mode 100644 index 0000000000..12f3acb2da --- /dev/null +++ b/meta/conf/prexport.conf | |||
@@ -0,0 +1 @@ | |||
INHERIT += "prexport" | |||
diff --git a/meta/conf/primport.conf b/meta/conf/primport.conf new file mode 100644 index 0000000000..d94ea1b1e2 --- /dev/null +++ b/meta/conf/primport.conf | |||
@@ -0,0 +1 @@ | |||
INHERIT += "primport" | |||