poky: subtree update:2834c2f853..17aabc0127
Adam Romanek (3):
bitbake: fetch/git: run gc in foreground to avoid race with tar
bitbake: fetch2/s3: allow to use credentials from environment variables
own-mirrors: Add support for s3:// scheme in SOURCE_MIRROR_URL
Alexander Kanavin (44):
devtool upgrade: rebase override-only patches as well
cmake: update 3.20.3 -> 3.20.4
gnu-config: update to latest revision
bash: update 5.1 -> 5.1.8
dnf: updatee 4.7.0 -> 4.8.0
vulkan-samples: update to latest revision
bind: upgrade 9.16.16 -> 9.16.18
bluez5: upgrade 5.58 -> 5.59
dejagnu: upgrade 1.6.2 -> 1.6.3
libdnf: upgrade 0.63.0 -> 0.63.1
libpcre: upgrade 8.44 -> 8.45
libxi: upgrade 1.7.10 -> 1.7.99.2
mtools: upgrade 4.0.29 -> 4.0.31
python3-git: upgrade 3.1.17 -> 3.1.18
sqlite3: upgrade 3.35.5 -> 3.36.0
vte: upgrade 0.64.1 -> 0.64.2
x264: upgrade to latest revision
python3: apply test skipping patch unconditionally
pypi: set SRC_URI with _prepend, not with +=
man-pages: upgrade 5.11 -> 5.12
rt-tests: update 1.10 -> 2.1
python3-iniparse: update 0.4 -> 0.5
iputils: correct upstream version check
texinfo: update 6.7 -> 6.8
xserver-xorg: exclude development snapshots from upstream version checks
xwayland: exclude development snapshots from upstream version checks
devtool: correctly handle non-standard source tree locations in upgrades
llvm: make upgradable via devtool
xserver-xorg: update 1.20.11 -> 1.20.12
libmodulemd: update 2.12.1 -> 2.13.0
bluez5: upgrade 5.59 -> 5.60
createrepo-c: upgrade 0.17.3 -> 0.17.4
ethtool: upgrade 5.12 -> 5.13
gtk+3: upgrade 3.24.29 -> 3.24.30
harfbuzz: upgrade 2.8.1 -> 2.8.2
iproute2: upgrade 5.12.0 -> 5.13.0
libgit2: upgrade 1.1.0 -> 1.1.1
mpg123: upgrade 1.28.0 -> 1.28.2
mtools: upgrade 4.0.31 -> 4.0.32
ruby: upgrade 3.0.1 -> 3.0.2
stress-ng: upgrade 0.12.11 -> 0.12.12
webkitgtk: upgrade 2.32.1 -> 2.32.2
xwayland: upgrade 21.1.1 -> 21.1.2
tcl: fix upstream version check
Alexey Brodkin (3):
dpkg: Add ARC support
default-distrovars.inc: Remove seccomp for ARC
dhcpcd: add ARC support
Andreas Müller (4):
libdrm: upgrade 2.4.106 -> 2.4.107
mesa: upgrade 21.1.3 -> 21.1.4
pango: upgrade 1.48.5 -> 1.48.7
mesa: upgrade 21.1.4 -> 21.1.5
Andrej Valek (1):
busybox: add tmpdir option into mktemp applet
Armin Kuster (1):
maintainers.inc: remove myself as a Maintainer
Asfak Rahman (1):
openssh: Remove temporary keys before generating new ones
Bruce Ashfield (24):
linux-yocto/5.10: update to v5.10.46
linux-yocto/5.10: features/nft_tables: refresh config options
linux-yocto/5.4: update to v5.4.128
linux-yocto/5.10: rcu: Fix stall-warning deadlock due to non-release of rcu_node ->lock
linux-yocto/5.10: update to v5.10.47
linux-yocto/5.4: update to v5.4.129
linux-yocto/5.10: scsi-debug needs scsi-disk
linux-libc-headers: update to 5.13
kernel-devsrc: fix scripts/prepare for ARM64
kernel-devsrc: fix scripts prepare for powerpc
kernel-devsrc: powerpc64 add scripts prepare support
linux-yocto: introduce 5.13 recipes
linux-yocto/5.13: add devupstream support
linux-yocto-rt/5.13: integrate -rt1
linux-yocto: add vfat KERNEL_FEATURE when MACHINE_FEATURES include vfat
linux-yocto/5.10: update to v5.10.49
linux-yocto/5.4: update to v5.4.131
linux-yocto/5.13: update to v5.13.2
linux-yocto/5.10: update to v5.10.50
linux-yocto/5.4: update to v5.4.132
linux-yocto/5.13: update to v5.13.3
linux-yocto/5.13: update to v5.13.4
linux-yocto/5.10: update to v5.10.52
linux-yocto/5.4: update to v5.4.134
Changhyeok Bae (1):
iputils: Update to 20210202
Changqing Li (1):
boost-build-native: workaround one rarely hang problem on fedora34
Christoph Muellner (1):
ldconfig-native: Add RISC-V support
Damian Wrobel (1):
gobject-introspection: Fix the license (add MIT)
Denys Dmytriyenko (1):
bitbake: providers: replace newly added logger.warn() with logger.warning()
Fabio Berton (1):
lib/oe/package_manager: Don't ignore installation failures in install_complementary
Florian Amstutz (1):
devtool: deploy-target: Fix preserving attributes when using --strip
Jose Quaresma (3):
glslang: upgrade 11.4.0 -> 11.5.0
shaderc: upgrade 2021.0 -> 2021.1
spirv-tools: upgrade 2021.1 -> 2021.2
Joshua Watt (3):
ref-manual: Document BUILDHISTORY_PATH_PREFIX_STRIP
bitbake: bitbake: Add piping compression library
bitbake: server: Fix early parsing errors preventing zombie bitbake
Khem Raj (7):
glib-2.0: Fix signature of close_range
gnome-desktop-testing: Fix non-literal format string warning
util-linux: Disable chfn-chsh on non-target builds
libseccomp: Update to main branch
systemd: Fix libseccomp testcase involving __NR_ppoll
util-linux: Fix signature of close_range()
gpgme: Use glibc provided closefrom API when available
Lee Chee Yang (1):
qemu: fix CVE-2021-3527
Marek Vasut (2):
pulseaudio: Drop pulseaudio-conf
update-rc.d: update SRCREV to pull in fix for non-bash shell support
Mark Hatle (1):
populate_sdk_ext: Error if trying to generate an eSDK from a mulitconfig
Max Krummenacher (1):
xwayland: port packageconfig from xserver-xorg recipe
Michael Halstead (1):
releases: update to include 3.1.9
Michael Ho (1):
sstate.bbclass: fix errors about read-only sstate mirrors
Mike Crowe (1):
licence_image: Add lic-pkgs IMAGE_FEATURE
Mingli Yu (4):
pulseaudio: check if NEON code can be compiled on arm
perlcross: check the file if patched or not
perl: correct libpth and glibpth
parselogs.py: ignore rndr initialization failure
Patrick Williams (1):
docs: remove image-mklibs references
Paul Barker (1):
linux-yocto: Fix devupstream SRCREV assignment
Peter Bergin (1):
Revert "libubootenv: inherit uboot-config"
Quentin Schulz (1):
docs: replace remaining ``FOO`` by :term:`FOO`
Ralph Siemsen (1):
oeqa/manual/toaster: fix small typo
Richard Purdie (26):
package_pkgdata: Avoid task hash mismatches for generic task changes
selftest/fetch: Avoid occasional selftest failure from poor temp file name choice
kernel: Fix interaction when packaging disabled
kernel-devicetree: Fix interaction when packaging disabled
python3-pip/python3-pbr: Drop obsolete md5sum at upgrade
oeqa/selftest/runcmd: Tweal test timeouts
bash: Fix a rare make race build failure
sstate/staging: Handle directory creation race issue
oeqa/selftest/archiver: Allow tests to ignore empty directories
dwarfsrcfiles: Avoid races over debug-link files
oeqa/selftest/multiprocesslauch: Fix test race
runqemu: Remove potential lock races around tap device handling
glibc-testsuite: Fix build failures when directly running recipe
license: Drop adding RRECOMMENDS for license packages
report-error: Drop pointless inherit
pseudo: Add uninative configuration sanity check
pseudo: Update to latest version including statx fix
sstate: Drop pseudo exclusion
oeqa/qemurunner: Handle files no longer existing gracefully
python3: Add a fix for a make install race
Add README link to README.poky
README.OE-Core/README.qemu: Move to markdown format
bitbake: data_smart/parse: Allow ':' characters in variable/function names
zstd: Include pzstd in the build
buildtools-tarball: Add lz4 and ztsd (including pzstd)
build-appliance-image: Update to master head revision
Ross Burton (29):
glibc: backport MTE improvements from master
glibc: re-enable memory tagging
libgudev: fix SRC_URI
cantarell-fonts: fix SRC_URI
shadow: generate alternative links for chfn and chsh
util-linux: build chfn and chsh
util-linux: add missing ptest dependencies
util-linux: backport test suite fixes
util-linux: rewrite the ptest integration
glib-2.0: fix g-file-into modification time test
oeqa/selftest/recipetool: update socat version to fix failing download
parted: improve ptest execution
tcl: suffix all Tcl man pages instead of using alternatives
tcl: EXTRA_OECONF already passes --libdir, don't do it again
tcl: mark a patch as upstreamable
tcl: use tcl-core instead of patching out packages
tcl: use AUTOTOOLS_SCRIPT_PATH
tcl: remove redundant file creation
tcl: detect tests that error as well as fail
tcl: clock.test needs a timezone to be set
tcl: fix race in interp.test
parted: remove obsolete patch
parted: fix ptest RRECOMMENDS
busybox: support mounting swap via labels
meta: remove redundant ${libdir}/cmake from FILES_${PN}-dev
cups: update to 2.3.3op2
parted: skip tests that need vfat support
avahi: fix CVE-2021-36217, crash on pinging '.local'
parted: add device mappper PACKAGECONFIG
Sakib Sajal (3):
buildstats.bbclass: log host data on failure to task specific file
oe-time-dd-test.sh: add options and refactor
scripts/oe-time-dd-test.sh: run "uptime" on each iteration
Saul Wold (4):
qemurunner: Add info log for qemu startup
oeqa/qemurunner: add support qmp cmd args
oeqa/dump.py: Add support for QMP command arguments
testimage.bbclass: Add dump-guest-memory cmd
Scott Weaver (1):
meta-skeleton: update to satisfy yocto-check-layer tests
Tim Orling (6):
python3-importlib-metadata: upgrade 4.5.0 -> 4.6.0
python3-packaging: upgrade 20.9 -> 21.0
python3-hypothesis: upgrade 6.14.0 -> 6.14.1
python3-zipp: upgrade 3.4.1 -> 3.5.0
at-spi2-core: upgrade 2.40.2 -> 2.40.3
python3-hypothesis: upgrade 6.14.1 -> 6.14.3
Tony Tascioglu (1):
valgrind: skip flaky ptest fb_test_amd64
Trevor Gamblin (2):
python3-pip: upgrade 20.0.2 -> 21.1.2
python3-pip: add multiprocessing to RDEPENDS
Yi Zhao (1):
libffi: disable use of static exec trampolines
Zoltán Böszörményi (1):
tzdata: Allow controlling zoneinfo binary format
Zqiang (1):
ifupdown: Skip wrong test item
bkylerussell@gmail.com (1):
gstreamer: add libgst packages to PACKAGES_DYNAMIC
jbouchard (1):
Use the label provided when formating a dos partition
wangmy (19):
libcap: upgrade 2.50 -> 2.51
libhandy: upgrade 1.2.2 -> 1.2.3
libva: upgrade 2.11.0 -> 2.12.0
libxcrypt: upgrade 4.4.22 -> 4.4.23
python3-numpy: upgrade 1.20.3 -> 1.21.0
python3-pbr: upgrade 5.4.4 -> 5.6.0
cmake: upgrade 3.20.4 -> 3.20.5
gpgme: upgrade 1.15.1 -> 1.16.0
libglu: upgrade 9.0.1 -> 9.0.2
stress-ng: upgrade 0.12.10 -> 0.12.11
xf86-input-libinput: upgrade 1.0.1 -> 1.1.0
vulkan-headers: upgrade 1.2.176 -> 1.2.182
vulkan-loader: upgrade 1.2.176 -> 1.2.182
vulkan-tools: upgrade 1.2.176 -> 1.2.182
gnome-desktop-testing: upgrade 2018.1 -> 2021.1
python3-importlib-metadata: upgrade 4.6.0 -> 4.6.1
u-boot: upgrade 2021.04 -> 2021.07
python3-setuptools: upgrade 57.0.0 -> 57.1.0
btrfs-tools: upgrade 5.12.1 -> 5.13
zangrc (1):
python3-pip: upgrade 21.1.2 -> 21.1.3
zhengruoqin (3):
libffi: upgrade 3.3 -> 3.4.2
python3: upgrade 3.9.5 -> 3.9.6
python3-pathlib2: upgrade 2.3.5 -> 2.3.6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: If493204235c3a1ce4e7fe65438168512d17a900e
diff --git a/poky/scripts/lib/devtool/deploy.py b/poky/scripts/lib/devtool/deploy.py
index e5af2c9..8333225 100644
--- a/poky/scripts/lib/devtool/deploy.py
+++ b/poky/scripts/lib/devtool/deploy.py
@@ -168,7 +168,7 @@
if args.strip and not args.dry_run:
# Fakeroot copy to new destination
srcdir = recipe_outdir
- recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'deploy-target-stripped')
+ recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'devtool-deploy-target-stripped')
if os.path.isdir(recipe_outdir):
bb.utils.remove(recipe_outdir, True)
exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True)
diff --git a/poky/scripts/lib/devtool/upgrade.py b/poky/scripts/lib/devtool/upgrade.py
index 24e3700..da1456a 100644
--- a/poky/scripts/lib/devtool/upgrade.py
+++ b/poky/scripts/lib/devtool/upgrade.py
@@ -261,21 +261,20 @@
logger.warning('By user choice, the following patches will NOT be applied to the new source tree:\n %s' % '\n '.join([os.path.basename(patch) for patch in patches]))
else:
__run('git checkout devtool-patched -b %s' % branch)
- skiptag = False
- try:
- __run('git rebase %s' % rev)
- except bb.process.ExecutionError as e:
- skiptag = True
- if 'conflict' in e.stdout:
- logger.warning('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip()))
- else:
- logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout))
- if not skiptag:
- if uri.startswith('git://') or uri.startswith('gitsm://'):
- suffix = 'new'
- else:
- suffix = newpv
- __run('git tag -f devtool-patched-%s' % suffix)
+ (stdout, _) = __run('git branch --list devtool-override-*')
+ branches_to_rebase = [branch] + stdout.split()
+ for b in branches_to_rebase:
+ logger.info("Rebasing {} onto {}".format(b, rev))
+ __run('git checkout %s' % b)
+ try:
+ __run('git rebase %s' % rev)
+ except bb.process.ExecutionError as e:
+ if 'conflict' in e.stdout:
+ logger.warning('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip()))
+ __run('git rebase --abort')
+ else:
+ logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout))
+ __run('git checkout %s' % branch)
if tmpsrctree:
if keep_temp:
@@ -522,6 +521,15 @@
else:
srctree = standard.get_default_srctree(config, pn)
+ # Check that recipe isn't using a shared workdir
+ s = os.path.abspath(rd.getVar('S'))
+ workdir = os.path.abspath(rd.getVar('WORKDIR'))
+ srctree_s = srctree
+ if s.startswith(workdir) and s != workdir and os.path.dirname(s) != workdir:
+ # Handle if S is set to a subdirectory of the source
+ srcsubdir = os.path.relpath(s, workdir).split(os.sep, 1)[1]
+ srctree_s = os.path.join(srctree, srcsubdir)
+
# try to automatically discover latest version and revision if not provided on command line
if not args.version and not args.srcrev:
version_info = oe.recipeutils.get_recipe_upstream_version(rd)
@@ -551,12 +559,12 @@
try:
logger.info('Extracting current version source...')
rev1, srcsubdir1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides)
- old_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or ""))
+ old_licenses = _extract_licenses(srctree_s, (rd.getVar('LIC_FILES_CHKSUM') or ""))
logger.info('Extracting upgraded version source...')
rev2, md5, sha256, srcbranch, srcsubdir2 = _extract_new_source(args.version, srctree, args.no_patch,
args.srcrev, args.srcbranch, args.branch, args.keep_temp,
tinfoil, rd)
- new_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or ""))
+ new_licenses = _extract_licenses(srctree_s, (rd.getVar('LIC_FILES_CHKSUM') or ""))
license_diff = _generate_license_diff(old_licenses, new_licenses)
rf, copied = _create_new_recipe(args.version, md5, sha256, args.srcrev, srcbranch, srcsubdir1, srcsubdir2, config.workspace_path, tinfoil, rd, license_diff, new_licenses, srctree, args.keep_failure)
except bb.process.CmdError as e:
@@ -565,7 +573,7 @@
_upgrade_error(e, rf, srctree, args.keep_failure)
standard._add_md5(config, pn, os.path.dirname(rf))
- af = _write_append(rf, srctree, args.same_dir, args.no_same_dir, rev2,
+ af = _write_append(rf, srctree_s, args.same_dir, args.no_same_dir, rev2,
copied, config.workspace_path, rd)
standard._add_md5(config, pn, af)
diff --git a/poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index f2639e7..32e47f1 100644
--- a/poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -186,8 +186,10 @@
# dosfs image, created by mkdosfs
bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno)
- dosfs_cmd = "mkdosfs -n boot -i %s -S 512 -C %s %d" % \
- (part.fsuuid, bootimg, blocks)
+ label = part.label if part.label else "boot"
+
+ dosfs_cmd = "mkdosfs -n %s -i %s -S 512 -C %s %d" % \
+ (label, part.fsuuid, bootimg, blocks)
exec_native_cmd(dosfs_cmd, native_sysroot)
mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir)
diff --git a/poky/scripts/oe-time-dd-test.sh b/poky/scripts/oe-time-dd-test.sh
index ccdd55e..386de83 100755
--- a/poky/scripts/oe-time-dd-test.sh
+++ b/poky/scripts/oe-time-dd-test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# oe-time-dd-test records how much time it takes to
# write <count> number of kilobytes to the filesystem.
@@ -8,23 +8,24 @@
# The purporse of this script is to find which part of
# the build system puts stress on the filesystem io and
# log all the processes.
-
usage() {
- echo "Usage: $0 <count>"
+ echo "$0 is used to detect i/o latency and runs commands to display host information."
+ echo "The following commands are run in order:"
+ echo "1) top -c -b -n1 -w 512"
+ echo "2) iostat -y -z -x 5 1"
+ echo "3) tail -30 tmp*/log/cooker/*/console-latest.log to gather cooker log."
+ echo " "
+ echo "Options:"
+ echo "-c | --count <amount> dd (transfer) <amount> KiB of data within specified timeout to detect latency."
+ echo " Must enable -t option."
+ echo "-t | --timeout <time> timeout in seconds for the <count> amount of data to be transferred."
+ echo "-l | --log-only run the commands without performing the data transfer."
+ echo "-h | --help show help"
+
}
-TIMEOUT=15
-
-if [ $# -ne 1 ]; then
- usage
- exit 1
-fi
-
-uptime
-timeout ${TIMEOUT} dd if=/dev/zero of=oe-time-dd-test.dat bs=1024 count=$1 conv=fsync
-if [ $? -ne 0 ]; then
- echo "Timeout used: ${TIMEOUT}"
- echo "start: top output"
+run_cmds() {
+ echo "start: top output"
top -c -b -n1 -w 512
echo "end: top output"
echo "start: iostat"
@@ -33,4 +34,69 @@
echo "start: cooker log"
tail -30 tmp*/log/cooker/*/console-latest.log
echo "end: cooker log"
+}
+
+if [ $# -lt 1 ]; then
+ usage
+ exit 1
+fi
+
+re_c='^[0-9]+$'
+#re_t='^[0-9]+([.][0-9]+)?$'
+
+while [[ $# -gt 0 ]]; do
+ key="$1"
+
+ case $key in
+ -c|--count)
+ COUNT=$2
+ shift
+ shift
+ if ! [[ $COUNT =~ $re_c ]] || [[ $COUNT -le 0 ]] ; then
+ usage
+ exit 1
+ fi
+ ;;
+ -t|--timeout)
+ TIMEOUT=$2
+ shift
+ shift
+ if ! [[ $TIMEOUT =~ $re_c ]] || [[ $TIMEOUT -le 0 ]] ; then
+ usage
+ exit 1
+ fi
+ ;;
+ -l|--log-only)
+ LOG_ONLY="true"
+ shift
+ shift
+ ;;
+ -h|--help)
+ usage
+ exit 0
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+done
+
+
+if [ "$LOG_ONLY" = "true" ] ; then
+ uptime
+ run_cmds
+ exit
+fi
+
+if [ -z ${TIMEOUT+x} ] || [ -z ${COUNT+x} ] ; then
+ usage
+ exit 1
+fi
+
+uptime
+echo "Timeout used: ${TIMEOUT}"
+timeout ${TIMEOUT} dd if=/dev/zero of=oe-time-dd-test.dat bs=1024 count=${COUNT} conv=fsync
+if [ $? -ne 0 ]; then
+ run_cmds
fi
diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu
index 1f332ef..2914f15 100755
--- a/poky/scripts/runqemu
+++ b/poky/scripts/runqemu
@@ -233,9 +233,12 @@
def release_taplock(self):
if self.taplock_descriptor:
logger.debug("Releasing lockfile for tap device '%s'" % self.tap)
- fcntl.flock(self.taplock_descriptor, fcntl.LOCK_UN)
+ # We pass the fd to the qemu process and if we unlock here, it would unlock for
+ # that too. Therefore don't unlock, just close
+ # fcntl.flock(self.taplock_descriptor, fcntl.LOCK_UN)
self.taplock_descriptor.close()
- os.remove(self.taplock)
+ # Removing the file is a potential race, don't do that either
+ # os.remove(self.taplock)
self.taplock_descriptor = None
def check_free_port(self, host, port, lockdir):
@@ -273,17 +276,23 @@
def release_portlock(self, lockfile=None):
if lockfile != None:
- logger.debug("Releasing lockfile '%s'" % lockfile)
- fcntl.flock(self.portlocks[lockfile], fcntl.LOCK_UN)
- self.portlocks[lockfile].close()
- os.remove(lockfile)
- del self.portlocks[lockfile]
+ logger.debug("Releasing lockfile '%s'" % lockfile)
+ # We pass the fd to the qemu process and if we unlock here, it would unlock for
+ # that too. Therefore don't unlock, just close
+ # fcntl.flock(self.portlocks[lockfile], fcntl.LOCK_UN)
+ self.portlocks[lockfile].close()
+ # Removing the file is a potential race, don't do that either
+ # os.remove(lockfile)
+ del self.portlocks[lockfile]
elif len(self.portlocks):
for lockfile, descriptor in self.portlocks.items():
logger.debug("Releasing lockfile '%s'" % lockfile)
- fcntl.flock(descriptor, fcntl.LOCK_UN)
+ # We pass the fd to the qemu process and if we unlock here, it would unlock for
+ # that too. Therefore don't unlock, just close
+ # fcntl.flock(descriptor, fcntl.LOCK_UN)
descriptor.close()
- os.remove(lockfile)
+ # Removing the file is a potential race, don't do that either
+ # os.remove(lockfile)
self.portlocks = {}
def get(self, key):