diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-07-23 20:09:54 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2021-07-28 20:22:04 +0300 |
commit | 5f35090dc809872fb7b8f381c1ccf995b75f03a0 (patch) | |
tree | 630551abdfa860e31458f442108bf4a3d91993d4 /poky/meta/classes | |
parent | 69721092c033f1c69060d2a5ae865f72a862e583 (diff) | |
download | openbmc-5f35090dc809872fb7b8f381c1ccf995b75f03a0.tar.xz |
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
Diffstat (limited to 'poky/meta/classes')
-rw-r--r-- | poky/meta/classes/buildstats.bbclass | 44 | ||||
-rw-r--r-- | poky/meta/classes/core-image.bbclass | 2 | ||||
-rw-r--r-- | poky/meta/classes/kernel-devicetree.bbclass | 11 | ||||
-rw-r--r-- | poky/meta/classes/kernel.bbclass | 2 | ||||
-rw-r--r-- | poky/meta/classes/license.bbclass | 8 | ||||
-rw-r--r-- | poky/meta/classes/license_image.bbclass | 10 | ||||
-rw-r--r-- | poky/meta/classes/own-mirrors.bbclass | 1 | ||||
-rw-r--r-- | poky/meta/classes/package_pkgdata.bbclass | 2 | ||||
-rw-r--r-- | poky/meta/classes/populate_sdk_ext.bbclass | 5 | ||||
-rw-r--r-- | poky/meta/classes/pypi.bbclass | 2 | ||||
-rw-r--r-- | poky/meta/classes/report-error.bbclass | 2 | ||||
-rw-r--r-- | poky/meta/classes/sstate.bbclass | 18 | ||||
-rw-r--r-- | poky/meta/classes/staging.bbclass | 6 | ||||
-rw-r--r-- | poky/meta/classes/testimage.bbclass | 1 |
14 files changed, 72 insertions, 42 deletions
diff --git a/poky/meta/classes/buildstats.bbclass b/poky/meta/classes/buildstats.bbclass index 8a1466d3f..0de605200 100644 --- a/poky/meta/classes/buildstats.bbclass +++ b/poky/meta/classes/buildstats.bbclass @@ -108,25 +108,31 @@ def write_host_data(logfile, e, d, type): import subprocess, os, datetime # minimum time allowed for each command to run, in seconds time_threshold = 0.5 + limit = 10 # the total number of commands num_cmds = 0 - # interval at which data will be logged - interval = int(d.getVar("BB_HEARTBEAT_EVENT", False)) msg = "" if type == "interval": + # interval at which data will be logged + interval = d.getVar("BB_HEARTBEAT_EVENT", False) + if interval is None: + bb.warn("buildstats: Collecting host data at intervals failed. Set BB_HEARTBEAT_EVENT=\"<interval>\" in conf/local.conf for the interval at which host data will be logged.") + d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") + return + interval = int(interval) cmds = d.getVar('BB_LOG_HOST_STAT_CMDS_INTERVAL') - msg = "Host Stats: Collecting data at interval.\n" + msg = "Host Stats: Collecting data at %d second intervals.\n" % interval if cmds is None: d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") - bb.warn("buildstats: Collecting host data at intervals failed. Set BB_LOG_HOST_STAT_CMDS_INTERVAL=\"command1 ; command2 ; ... \" in conf/local.conf\n") + bb.warn("buildstats: Collecting host data at intervals failed. Set BB_LOG_HOST_STAT_CMDS_INTERVAL=\"command1 ; command2 ; ... \" in conf/local.conf.") return if type == "failure": cmds = d.getVar('BB_LOG_HOST_STAT_CMDS_FAILURE') msg = "Host Stats: Collecting data on failure.\n" - msg += "Failed at task " + e.task + "\n" + msg += "Failed at task: " + e.task + "\n" if cmds is None: d.setVar("BB_LOG_HOST_STAT_ON_FAILURE", "0") - bb.warn("buildstats: Collecting host data on failure failed. Set BB_LOG_HOST_STAT_CMDS_FAILURE=\"command1 ; command2 ; ... \" in conf/local.conf\n") + bb.warn("buildstats: Collecting host data on failure failed. Set BB_LOG_HOST_STAT_CMDS_FAILURE=\"command1 ; command2 ; ... \" in conf/local.conf.") return c_san = [] for cmd in cmds.split(";"): @@ -134,18 +140,20 @@ def write_host_data(logfile, e, d, type): continue num_cmds += 1 c_san.append(cmd) - if num_cmds <= 0: - d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") - d.setVar("BB_LOG_HOST_STAT_ON_FAILURE", "0") + if num_cmds == 0: + if type == "interval": + d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") + if type == "failure": + d.setVar("BB_LOG_HOST_STAT_ON_FAILURE", "0") return # return if the interval is not enough to run all commands within the specified BB_HEARTBEAT_EVENT interval - limit = interval / num_cmds - if limit <= time_threshold: - d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") - d.setVar("BB_LOG_HOST_STAT_ON_FAILURE", "0") - bb.warn("buildstats: Collecting host data failed. BB_HEARTBEAT_EVENT interval not enough to run the specified commands. HINT: Increase value of BB_HEARTBEAT_EVENT in conf/local.conf\n") - return + if type == "interval": + limit = interval / num_cmds + if limit <= time_threshold: + d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") + bb.warn("buildstats: Collecting host data failed. BB_HEARTBEAT_EVENT interval not enough to run the specified commands. Increase value of BB_HEARTBEAT_EVENT in conf/local.conf.") + return # set the environment variables path = d.getVar("PATH") @@ -179,7 +187,7 @@ python run_buildstats () { taskdir = os.path.join(bsdir, d.getVar('PF')) if isinstance(e, bb.event.HeartbeatEvent) and bb.utils.to_boolean(d.getVar("BB_LOG_HOST_STAT_ON_INTERVAL")): bb.utils.mkdirhier(bsdir) - write_host_data(os.path.join(bsdir, "host_stats"), e, d, "interval") + write_host_data(os.path.join(bsdir, "host_stats_interval"), e, d, "interval") if isinstance(e, bb.event.BuildStarted): ######################################################################## @@ -254,8 +262,8 @@ python run_buildstats () { build_status = os.path.join(bsdir, "build_stats") with open(build_status, "a") as f: f.write(d.expand("Failed at: ${PF} at task: %s \n" % e.task)) - if bb.utils.to_boolean(d.getVar("BB_LOG_HOST_STAT_ON_FAILURE")): - write_host_data(os.path.join(bsdir, "host_stats"), e, d, "failure") + if bb.utils.to_boolean(d.getVar("BB_LOG_HOST_STAT_ON_FAILURE")): + write_host_data(os.path.join(bsdir, "host_stats_%s_failure" % e.task), e, d, "failure") } addhandler run_buildstats diff --git a/poky/meta/classes/core-image.bbclass b/poky/meta/classes/core-image.bbclass index d81f68bd2..84fd3eeb3 100644 --- a/poky/meta/classes/core-image.bbclass +++ b/poky/meta/classes/core-image.bbclass @@ -31,6 +31,8 @@ # - post-install-logging # - dev-pkgs - development packages (headers, etc.) for all installed packages in the rootfs # - dbg-pkgs - debug symbol packages for all installed packages in the rootfs +# - lic-pkgs - license packages for all installed pacakges in the rootfs, requires +# LICENSE_CREATE_PACKAGE="1" to be set when building packages too # - doc-pkgs - documentation packages for all installed packages in the rootfs # - bash-completion-pkgs - bash-completion packages for recipes using bash-completion bbclass # - ptest-pkgs - ptest packages for all ptest-enabled recipes diff --git a/poky/meta/classes/kernel-devicetree.bbclass b/poky/meta/classes/kernel-devicetree.bbclass index d4f886420..27a4905ac 100644 --- a/poky/meta/classes/kernel-devicetree.bbclass +++ b/poky/meta/classes/kernel-devicetree.bbclass @@ -1,8 +1,11 @@ # Support for device tree generation -PACKAGES_append = " \ - ${KERNEL_PACKAGE_NAME}-devicetree \ - ${@[d.getVar('KERNEL_PACKAGE_NAME') + '-image-zimage-bundle', ''][d.getVar('KERNEL_DEVICETREE_BUNDLE') != '1']} \ -" +python () { + if not bb.data.inherits_class('nopackages', d): + d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-devicetree") + if d.getVar('KERNEL_DEVICETREE_BUNDLE') == '1': + d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-image-zimage-bundle") +} + FILES_${KERNEL_PACKAGE_NAME}-devicetree = "/${KERNEL_IMAGEDEST}/*.dtb /${KERNEL_IMAGEDEST}/*.dtbo" FILES_${KERNEL_PACKAGE_NAME}-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage-*.dtb.bin" diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass index 379bed44f..846b19663 100644 --- a/poky/meta/classes/kernel.bbclass +++ b/poky/meta/classes/kernel.bbclass @@ -92,6 +92,8 @@ python __anonymous () { imagedest = d.getVar('KERNEL_IMAGEDEST') for type in types.split(): + if bb.data.inherits_class('nopackages', d): + continue typelower = type.lower() d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower)) d.setVar('FILES_' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type) diff --git a/poky/meta/classes/license.bbclass b/poky/meta/classes/license.bbclass index f7978e266..c87473cbb 100644 --- a/poky/meta/classes/license.bbclass +++ b/poky/meta/classes/license.bbclass @@ -63,14 +63,6 @@ def add_package_and_files(d): # first in PACKAGES to be sure that nothing else gets LICENSE_FILES_DIRECTORY d.setVar('PACKAGES', "%s %s" % (pn_lic, packages)) d.setVar('FILES_' + pn_lic, files) - for pn in packages.split(): - if pn == pn_lic: - continue - rrecommends_pn = d.getVar('RRECOMMENDS_' + pn) - if rrecommends_pn: - d.setVar('RRECOMMENDS_' + pn, "%s %s" % (pn_lic, rrecommends_pn)) - else: - d.setVar('RRECOMMENDS_' + pn, "%s" % (pn_lic)) def copy_license_files(lic_files_paths, destdir): import shutil diff --git a/poky/meta/classes/license_image.bbclass b/poky/meta/classes/license_image.bbclass index 73cebb4d5..5dbec288a 100644 --- a/poky/meta/classes/license_image.bbclass +++ b/poky/meta/classes/license_image.bbclass @@ -1,5 +1,15 @@ ROOTFS_LICENSE_DIR = "${IMAGE_ROOTFS}/usr/share/common-licenses" +# This requires LICENSE_CREATE_PACKAGE=1 to work too +COMPLEMENTARY_GLOB[lic-pkgs] = "*-lic" + +python() { + if not oe.data.typed_value('LICENSE_CREATE_PACKAGE', d): + features = set(oe.data.typed_value('IMAGE_FEATURES', d)) + if 'lic-pkgs' in features: + bb.error("'lic-pkgs' in IMAGE_FEATURES but LICENSE_CREATE_PACKAGE not enabled to generate -lic packages") +} + python write_package_manifest() { # Get list of installed packages license_image_dir = d.expand('${LICENSE_DIRECTORY}/${IMAGE_NAME}') diff --git a/poky/meta/classes/own-mirrors.bbclass b/poky/meta/classes/own-mirrors.bbclass index a77783513..d58a61fe0 100644 --- a/poky/meta/classes/own-mirrors.bbclass +++ b/poky/meta/classes/own-mirrors.bbclass @@ -10,4 +10,5 @@ osc://.*/.* ${SOURCE_MIRROR_URL} \n \ https?$://.*/.* ${SOURCE_MIRROR_URL} \n \ ftp://.*/.* ${SOURCE_MIRROR_URL} \n \ npm://.*/?.* ${SOURCE_MIRROR_URL} \n \ +s3://.*/.* ${SOURCE_MIRROR_URL} \n \ " diff --git a/poky/meta/classes/package_pkgdata.bbclass b/poky/meta/classes/package_pkgdata.bbclass index 18b7ed62e..a1ea8fc04 100644 --- a/poky/meta/classes/package_pkgdata.bbclass +++ b/poky/meta/classes/package_pkgdata.bbclass @@ -162,6 +162,6 @@ python package_prepare_pkgdata() { } package_prepare_pkgdata[cleandirs] = "${WORKDIR_PKGDATA}" -package_prepare_pkgdata[vardepsexclude] += "MACHINE_ARCH PACKAGE_EXTRA_ARCHS SDK_ARCH BUILD_ARCH SDK_OS BB_TASKDEPDATA" +package_prepare_pkgdata[vardepsexclude] += "MACHINE_ARCH PACKAGE_EXTRA_ARCHS SDK_ARCH BUILD_ARCH SDK_OS BB_TASKDEPDATA SSTATETASKS" diff --git a/poky/meta/classes/populate_sdk_ext.bbclass b/poky/meta/classes/populate_sdk_ext.bbclass index 517b4e45f..4aabafa07 100644 --- a/poky/meta/classes/populate_sdk_ext.bbclass +++ b/poky/meta/classes/populate_sdk_ext.bbclass @@ -750,6 +750,11 @@ fakeroot python do_populate_sdk_ext() { if d.getVar('SDK_ARCH') != d.getVar('BUILD_ARCH'): bb.fatal('The extensible SDK can currently only be built for the same architecture as the machine being built on - SDK_ARCH is set to %s (likely via setting SDKMACHINE) which is different from the architecture of the build machine (%s). Unable to continue.' % (d.getVar('SDK_ARCH'), d.getVar('BUILD_ARCH'))) + # FIXME hopefully we can remove this restriction at some point, but the eSDK + # can only be built for the primary (default) multiconfig + if d.getVar('BB_CURRENT_MC') != 'default': + bb.fatal('The extensible SDK can currently only be built for the default multiconfig. Currently trying to build for %s.' % d.getVar('BB_CURRENT_MC')) + d.setVar('SDK_INSTALL_TARGETS', get_sdk_install_targets(d)) if d.getVar('SDK_INCLUDE_BUILDTOOLS') == '1': buildtools_fn = get_current_buildtools(d) diff --git a/poky/meta/classes/pypi.bbclass b/poky/meta/classes/pypi.bbclass index 87b4c85fc..384a20987 100644 --- a/poky/meta/classes/pypi.bbclass +++ b/poky/meta/classes/pypi.bbclass @@ -19,7 +19,7 @@ PYPI_SRC_URI ?= "${@pypi_src_uri(d)}" HOMEPAGE ?= "https://pypi.python.org/pypi/${PYPI_PACKAGE}/" SECTION = "devel/python" -SRC_URI += "${PYPI_SRC_URI}" +SRC_URI_prepend = "${PYPI_SRC_URI} " S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}" UPSTREAM_CHECK_URI ?= "https://pypi.org/project/${PYPI_PACKAGE}/" diff --git a/poky/meta/classes/report-error.bbclass b/poky/meta/classes/report-error.bbclass index 9cb6b0bd3..de48e4ff0 100644 --- a/poky/meta/classes/report-error.bbclass +++ b/poky/meta/classes/report-error.bbclass @@ -6,8 +6,6 @@ # # Licensed under the MIT license, see COPYING.MIT for details -inherit base - ERR_REPORT_DIR ?= "${LOG_DIR}/error-report" def errorreport_getdata(e): diff --git a/poky/meta/classes/sstate.bbclass b/poky/meta/classes/sstate.bbclass index 3a3f7cc24..f6710fc28 100644 --- a/poky/meta/classes/sstate.bbclass +++ b/poky/meta/classes/sstate.bbclass @@ -123,8 +123,6 @@ SSTATE_HASHEQUIV_REPORT_TASKDATA[doc] = "Report additional useful data to the \ python () { if bb.data.inherits_class('native', d): d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH', False)) - if d.getVar("PN") == "pseudo-native": - d.appendVar('SSTATE_PKGARCH', '_${ORIGNATIVELSBSTRING}') elif bb.data.inherits_class('crosssdk', d): d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}")) elif bb.data.inherits_class('cross', d): @@ -483,7 +481,7 @@ def sstate_clean_cachefiles(d): ss = sstate_state_fromvars(ld, task) sstate_clean_cachefile(ss, ld) -def sstate_clean_manifest(manifest, d, prefix=None): +def sstate_clean_manifest(manifest, d, canrace=False, prefix=None): import oe.path mfile = open(manifest) @@ -501,7 +499,9 @@ def sstate_clean_manifest(manifest, d, prefix=None): if entry.endswith("/"): if os.path.islink(entry[:-1]): os.remove(entry[:-1]) - elif os.path.exists(entry) and len(os.listdir(entry)) == 0: + elif os.path.exists(entry) and len(os.listdir(entry)) == 0 and not canrace: + # Removing directories whilst builds are in progress exposes a race. Only + # do it in contexts where it is safe to do so. os.rmdir(entry[:-1]) else: os.remove(entry) @@ -539,7 +539,7 @@ def sstate_clean(ss, d): for lock in ss['lockfiles']: locks.append(bb.utils.lockfile(lock)) - sstate_clean_manifest(manifest, d) + sstate_clean_manifest(manifest, d, canrace=True) for lock in locks: bb.utils.unlockfile(lock) @@ -703,6 +703,10 @@ def sstate_package(ss, d): os.utime(siginfo, None) except PermissionError: pass + except OSError as e: + # Handle read-only file systems gracefully + if e.errno != errno.EROFS: + raise e return @@ -1145,6 +1149,10 @@ python sstate_eventhandler() { os.utime(siginfo, None) except PermissionError: pass + except OSError as e: + # Handle read-only file systems gracefully + if e.errno != errno.EROFS: + raise e } diff --git a/poky/meta/classes/staging.bbclass b/poky/meta/classes/staging.bbclass index 806a85773..32a615c74 100644 --- a/poky/meta/classes/staging.bbclass +++ b/poky/meta/classes/staging.bbclass @@ -409,7 +409,7 @@ python extend_recipe_sysroot() { if os.path.islink(f) and not os.path.exists(f): bb.note("%s no longer exists, removing from sysroot" % f) lnk = os.readlink(f.replace(".complete", "")) - sstate_clean_manifest(depdir + "/" + lnk, d, workdir) + sstate_clean_manifest(depdir + "/" + lnk, d, canrace=True, prefix=workdir) os.unlink(f) os.unlink(f.replace(".complete", "")) @@ -454,7 +454,7 @@ python extend_recipe_sysroot() { fl = depdir + "/" + l bb.note("Task %s no longer depends on %s, removing from sysroot" % (mytaskname, l)) lnk = os.readlink(fl) - sstate_clean_manifest(depdir + "/" + lnk, d, workdir) + sstate_clean_manifest(depdir + "/" + lnk, d, canrace=True, prefix=workdir) os.unlink(fl) os.unlink(fl + ".complete") @@ -475,7 +475,7 @@ python extend_recipe_sysroot() { continue else: bb.note("%s exists in sysroot, but is stale (%s vs. %s), removing." % (c, lnk, c + "." + taskhash)) - sstate_clean_manifest(depdir + "/" + lnk, d, workdir) + sstate_clean_manifest(depdir + "/" + lnk, d, canrace=True, prefix=workdir) os.unlink(depdir + "/" + c) if os.path.lexists(depdir + "/" + c + ".complete"): os.unlink(depdir + "/" + c + ".complete") diff --git a/poky/meta/classes/testimage.bbclass b/poky/meta/classes/testimage.bbclass index 43de9d4d7..ed3a885bd 100644 --- a/poky/meta/classes/testimage.bbclass +++ b/poky/meta/classes/testimage.bbclass @@ -130,6 +130,7 @@ testimage_dump_host () { testimage_dump_monitor () { query-status query-block + dump-guest-memory {"paging":false,"protocol":"file:%s.img"} } python do_testimage() { |