diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-02-01 23:15:24 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-14 15:26:03 +0000 |
commit | afbc3f44273fcc252cb31554c23011d8fdde3138 (patch) | |
tree | 372e4866545c32038daeb31d0834d75385644f22 /bitbake | |
parent | 8abf7d89a56cf70cbb0fa068241bbd082c394043 (diff) | |
download | poky-afbc3f44273fcc252cb31554c23011d8fdde3138.tar.gz |
bitbake: bitbake: cooker: don't stop file notifier when cooker is shutdown
It should be live/exited with server rather than cooker, fixed:
$ bitbake --server-only -T -1
Set MACHINE = "qemux86" in conf/local.conf
$ bitbake quilt
Set MACHINE = "qemuppc" in conf/local.conf
$ bitbake quilt
[snip]
ERROR: When reparsing /workspace1/lyang1/poky/meta/recipes-connectivity/openssl/openssl_1.0.2m.bb.do_package, the basehash value changed from c216f7f4fdd3cf4a0b10b975a636426c to d5a8e9431ab261381752d7a64c7b2fa9. The metadata is not deterministic and this needs to be fixed.
[snip]
This is because the server doesn't know local.conf is changed since the
notifiers are stopped, so it doesn't reparse, and then we would get the errors,
let the notifiers live/exited with server can fix the problem.
(Bitbake rev: a6a641cb9c5f3abe901b150da915372e295383d7)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/server/process.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index f991c8f123..af482f9d62 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -1604,8 +1604,6 @@ class BBCooker: | |||
1604 | 1604 | ||
1605 | if self.parser: | 1605 | if self.parser: |
1606 | self.parser.shutdown(clean=not force, force=force) | 1606 | self.parser.shutdown(clean=not force, force=force) |
1607 | self.notifier.stop() | ||
1608 | self.confignotifier.stop() | ||
1609 | 1607 | ||
1610 | def finishcommand(self): | 1608 | def finishcommand(self): |
1611 | self.state = state.initial | 1609 | self.state = state.initial |
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index 3d31355fd4..828159ed75 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py | |||
@@ -223,6 +223,8 @@ class ProcessServer(multiprocessing.Process): | |||
223 | 223 | ||
224 | try: | 224 | try: |
225 | self.cooker.shutdown(True) | 225 | self.cooker.shutdown(True) |
226 | self.cooker.notifier.stop() | ||
227 | self.cooker.confignotifier.stop() | ||
226 | except: | 228 | except: |
227 | pass | 229 | pass |
228 | 230 | ||