diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-11-23 00:55:50 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 04:36:32 +0300 |
commit | a5c52ff0bb57fccc2dcd3bd10647d2fa77ddf8c3 (patch) | |
tree | e085aadbd071233b82de4a8c76d269f9d746daaa /poky/bitbake/lib/bb/server | |
parent | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (diff) | |
download | openbmc-a5c52ff0bb57fccc2dcd3bd10647d2fa77ddf8c3.tar.xz |
poky: thud refresh 87e3a9739d..1cab405d88
Update poky to thud HEAD.
Adrian Bunk (1):
archiver.bbclass: Fix COPYLEFT_LICENSE_{IN, EX}CLUDE
Adrian Freihofer (2):
systemd: fix PN-container package splitting
devtool: fix target-deploy --strip
Alejandro Enedino Hernandez Samaniego (1):
python: Adds instructions to the manifest file
Alexander Kanavin (3):
meson: do not manipulate the environment when looking for python via pkg-config
openssl: update to 1.1.1a
libc-package: fix postinst error when ENABLE_BINARY_LOCALE_GENERATION = "0"
Alexey Brodkin (1):
gdb: Remove long ago upstreamed patch
André Draszik (1):
linux-firmware: better packaging for TI wl12xx & wl18xx firmwares
Anuj Mittal (13):
maintainers.inc: update Intel owners
gst-plugins-bad: add PACKAGECONFIG for msdk
gstreamer1.0: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-plugins-base: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-plugins-good: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-plugins-bad: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-plugins-ugly: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-libav: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-vaapi: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-rtsp-server: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-omx: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-python: upgrade 1.14.3 -> 1.14.4
gst-validate: upgrade 1.14.2 -> 1.14.4
Armin Kuster (1):
gnutls: update to 3.6.4
Bruce Ashfield (13):
linux-yocto: remove obselete options from lxc config
linux-yocto/4.14: configuration cleanups
linux-yocto/4.18: -rt sync and config cleanups
linux-yocto/tiny: switch default branch to standard/tiny/base
linux-yocto/tiny: restore qemuarm support
linux-yocto/4.18: bug fixes and configuration tweaks
linux-yocto/4.18: update to v4.18.17
linux-yocto/4.14: update to v4.14.79
linux-yocto/4.18: integrate CVE fixes
linux-yocto/4.18: update to v4.18.20
linux-yocto/4.18: update to v4.18.21
linux-yocto: configuration updates (virtio and tpm)
linux-yocto: correct qemumips64el definition
Carlos Rafael Giani (10):
gstreamer1.0: upgrade to version 1.14.3
gstreamer1.0-plugin-base: upgrade to version 1.14.3
gstreamer1.0-plugin-good: upgrade to version 1.14.3
gstreamer1.0-plugin-bad: upgrade to version 1.14.3
gstreamer1.0-plugin-ugly: upgrade to version 1.14.3
gstreamer1.0-libav: upgrade to version 1.14.3
gstreamer1.0-rtsp-server: upgrade to version 1.14.3
gstreamer1.0-vaapi: upgrade to version 1.14.3
gstreamer1.0-omx: upgrade to version 1.14.3
gstreamer1.0-python: upgrade to version 1.14.3
Changhyeok Bae (2):
iproute2: 4.18.0 -> 4.19.0
ethtool: 4.17 -> 4.19
Christophe PRIOUZEAU (1):
openssl: correct bad path on package preprocess
Douglas Royds (4):
boost-context: Reproducibility: Set .file section for all *_elf_gas.S files
reproducible: Refactor: Break out fixed_source_date_epoch() function
reproducible: Don't look for youngest file when no source tarball
ptest: Reproducibility: Take control of umask
Eric Chanudet (1):
licence: Add license file CC-BY-SA-4.0
Hongxu Jia (6):
elfutils: 0.174 -> 0.175
gnupg: upgrade 2.2.9 -> 2.2.10
gnupg: upgrade 2.2.10 -> 2.2.11
libgcrypt: upgrade 1.8.3 -> 1.8.4
ghostscript: 9.25 -> 9.26
go 1.9/1.11: fix textrel qa warning for non mips arch
Joshua Watt (3):
meta/icecc.bbclass: Move system blacklist to variables
meta/icecc.bbclass: Update system blacklists
classes/icecc.bbclass: Fix ccache disable
Kai Kang (1):
multilib_script: fix packages split
Khem Raj (3):
valgrind: Skip vgpreload_memcheck shared object from stripping
populate_sdk_ext.bbclass: Include site.conf in parsing for contents for local.conf
local.conf.sample: Update the sample config as per new migration manual
Ming Liu (1):
image.bbclass: fix a wrong position blank
Mingli Yu (2):
mdadm: improve the run-ptest
nspr: improve reproducibility
Niko Mauno (1):
opkg-utils: Fix update-alternatives link relocation
Otavio Salvador (1):
linux-firmware: Bump revision to 1baa348
Paul Eggleton (1):
socat: fix LICENSE
Peter Kjellerstedt (3):
meson: Correct use of the _append operator
bitbake: bitbake-diffsigs: Merge with bitbake-dumpsig
bitbake: bitbake-diffsigs: Support recursive deps with signature files
Richard Purdie (9):
meson: Disable rpath stripping at install time
scripts/runqemu: Fix logic error causing failures with MACHINE from the environment
meta-selftest/error: Cleanup large trailing whitespace
bitbake: server/process: Make lockfile handling clearer
bitbake: server/process: Show the last 60 log lines, not the last 10
bitbake: server/process: Show last 60 lines of the log if the server didn't start
poky.conf: Update the distros we test against on the autobuilder
poky: Update version to 2.6.1
build-appliance-image: Update to thud head revision
Robert Yang (5):
classes: Remove tab indentations in python code
recipes: Remove tab indentations in python code
bugzilla.bbclass: Remove it since obsoleted
sstate.bbclass: Only remove sstate file when task is existed
bitbake: server/process: print a message when no logfile
Ross Burton (12):
cpio: fix crash when appending to archives
image_types: use cpio-native to build cpio images
libtasn1: no need to inherit binconfig
binconfig: only try to mangles files
piglit: add missing waffle-bin dependency
ruby: upgrade 2.5.1 -> 2.5.3
insane: Clarify GNU_HASH warning
patchreview: Various fixes/improvements
python3: don't cripple target distutils
python3: drop redundant patch
bitbake: layerindex: don't use shell=True when cloning
bitbake: fetch: don't use shell=True when listing ar files
Zheng Ruoqin (2):
nss: Fix SHA_HTONL bug for arm 32be.
createrepo-c: Fix setup of logging (log domains)
Change-Id: I025dd27f44e57af38abff110ebc331e371bc461b
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/bitbake/lib/bb/server')
-rw-r--r-- | poky/bitbake/lib/bb/server/process.py | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/poky/bitbake/lib/bb/server/process.py b/poky/bitbake/lib/bb/server/process.py index 42d79079a..070da4fe7 100644 --- a/poky/bitbake/lib/bb/server/process.py +++ b/poky/bitbake/lib/bb/server/process.py @@ -239,6 +239,12 @@ class ProcessServer(multiprocessing.Process): while not lock: with bb.utils.timeout(3): lock = bb.utils.lockfile(lockfile, shared=False, retry=False, block=True) + if lock: + # We hold the lock so we can remove the file (hide stale pid data) + bb.utils.remove(lockfile) + bb.utils.unlockfile(lock) + return + if not lock: # Some systems may not have lsof available procs = None @@ -259,10 +265,6 @@ class ProcessServer(multiprocessing.Process): if procs: msg += ":\n%s" % str(procs) print(msg) - return - # We hold the lock so we can remove the file (hide stale pid data) - bb.utils.remove(lockfile) - bb.utils.unlockfile(lock) def idle_commands(self, delay, fds=None): nextsleep = delay @@ -412,23 +414,33 @@ class BitBakeServer(object): logstart_re = re.compile(self.start_log_format % ('([0-9]+)', '([0-9-]+ [0-9:.]+)')) started = False lines = [] + lastlines = [] with open(logfile, "r") as f: for line in f: if started: lines.append(line) else: + lastlines.append(line) res = logstart_re.match(line.rstrip()) if res: ldatetime = datetime.datetime.strptime(res.group(2), self.start_log_datetime_format) if ldatetime >= startdatetime: started = True lines.append(line) + if len(lastlines) > 60: + lastlines = lastlines[-60:] if lines: - if len(lines) > 10: - bb.error("Last 10 lines of server log for this session (%s):\n%s" % (logfile, "".join(lines[-10:]))) + if len(lines) > 60: + bb.error("Last 60 lines of server log for this session (%s):\n%s" % (logfile, "".join(lines[-60:]))) else: bb.error("Server log for this session (%s):\n%s" % (logfile, "".join(lines))) + elif lastlines: + bb.error("Server didn't start, last 60 loglines (%s):\n%s" % (logfile, "".join(lastlines))) + else: + bb.error("%s doesn't exist" % logfile) + raise SystemExit(1) + ready.close() def _startServer(self): |