master: subtree updates oct 4 2023

poky: 61531cd395..e444d2bed0: Adrian Freihofer (3): lib/oe/utils: Refactor to make multiprocess_launch callable without d lib/oe/package: Refactor to make strip_execs callable without d oeqa/selftest/devtool: Refactor runqemu pre-requisites Alexander Kanavin (69): cargo-c-native: fix version check igt-gpu-tools: do not write shortened git commit hash into binaries curl: build and run the full set of ptests ptest: report tests that were killed on timeout perl: use 64 bit integers across all targets perl: ensure all failures are caught strace: parallelize ptest strace: remove from time64.inc exception list busybox: enable 64 bit shell arithmetic (via long long type) openssl: parallelize tests openssl: ensure all ptest fails are caught glibc-tests: rename to glibc-y2038-tests sysstat: merge .inc into .bb sysstat: update 12.6.2 -> 12.7.4 glib-2.0: update 2.76.4 -> 2.78.0 ovmf: update edk2-stable202305 -> edk2-stable202308 libdnf: update 0.70.1 -> 0.71.0 liburi-perl: update 5.17 -> 5.21 python3-pygobject: update 3.44.1 -> 3.46.0 go-helloworld: update to latest revision gzip: update 1.12 -> 1.13 procps: update 4.0.3 -> 4.0.4 screen: update 4.9.0 -> 4.9.1 gobject-introspection: update 1.76.1 -> 1.78.0 igt-gpu-tools: update 1.27.1 -> 1.28 libva-utils: update 2.19.0 -> 2.20.0 piglit: update to latest revision groff: add a patch to resolve build races groff: fix another build race via backport systemd: upgrade 254 -> 254.4 util-linux: upgrade 2.39.1 -> 2.39.2 cmake: upgrade 3.27.4 -> 3.27.5 jquery: upgrade 3.7.0 -> 3.7.1 python3-setuptools-rust: upgrade 1.6.0 -> 1.7.0 vulkan: upgrade 1.3.250.0 -> 1.3.261.1 libxcb: upgrade 1.15 -> 1.16 xcb-proto: upgrade 1.15.2 -> 1.16.0 boost: upgrade 1.82.0 -> 1.83.0 btrfs-tools: upgrade 6.3.3 -> 6.5.1 createrepo-c: upgrade 0.21.1 -> 1.0.0 debianutils: upgrade 5.12 -> 5.13 diffoscope: upgrade 244 -> 249 ethtool: upgrade 6.3 -> 6.5 font-util: upgrade 1.4.0 -> 1.4.1 freetype: upgrade 2.13.1 -> 2.13.2 ghostscript: upgrade 10.01.2 -> 10.02.0 iproute2: upgrade 6.4.0 -> 6.5.0 json-c: upgrade 0.16 -> 0.17 kmscube: upgrade to latest revision libarchive: upgrade 3.7.1 -> 3.7.2 libsdl2: upgrade 2.28.0 -> 2.28.3 libsolv: upgrade 0.7.24 -> 0.7.25 man-pages: upgrade 6.04 -> 6.05.01 meson: upgrade 1.1.1 -> 1.2.1 mmc-utils: upgrade to latest revision mtd-utils: upgrade 2.1.5 -> 2.1.6 puzzles: upgrade to latest revision python3-dtschema: upgrade 2023.6.1 -> 2023.7 python3-git: upgrade 3.1.35 -> 3.1.36 python3-libarchive-c: upgrade 4.0 -> 5.0 python3-setuptools: upgrade 68.2.1 -> 68.2.2 python3-sphinx: upgrade 7.2.5 -> 7.2.6 seatd: upgrade 0.7.0 -> 0.8.0 sqlite3: upgrade 3.43.0 -> 3.43.1 tiff: upgrade 4.5.1 -> 4.6.0 vala: upgrade 0.56.8 -> 0.56.13 xf86-input-libinput: upgrade 1.3.0 -> 1.4.0 xwayland: upgrade 23.1.2 -> 23.2.1 python3-setuptools-scm: fix upstream version check Alexandre Belloni (1): python3: fix SoB on patch Antoine Lubineau (1): cve-check: add CVSS vector string to CVE database and reports Bruce Ashfield (9): linux-yocto/6.4: update to v6.4.15 linux-yocto/6.1: update to v6.1.52 linux-yocto/6.4: update to v6.4.16 linux-yocto/6.1: update to v6.1.53 linux-yocto/6.1: update to v6.1.55 linux-yocto-dev: update to v6.6-rcX linux-yocto: introduce 6.5 reference kernel recipes linux-libc-headers: uprev to v6.5 linux-libc-headers: default to 6.5 Charles-Antoine Couret (1): systemd-boot-cfg: add .conf suffix to default entry label Chen Qi (1): python3: add cpython to CVE_PRODUCT Daniel Semkowicz (2): wic: bootimg-partition: Fix file name in debug message uboot-extlinux-config.bbclass: Add missing variable descriptions Deepthi Hemraj (2): binutils: stable 2.41 branch updates. glibc: stable 2.38 branch updates. Denys Dmytriyenko (2): bitbake.conf: add MACHINE to SDK_NAME spdx: use TOOLCHAIN_OUTPUTNAME for SDK filename prefix Derek Straka (1): pypi.bbclass: Update the upstream checks to automatically replace '_' with '-' Eilís 'pidge' Ní Fhlannagáin (2): lib/oe/package_managegment: Add nativesdk-intercept PATH update_mandb: deb fails due to missing man cache Etienne Cordonnier (1): bitbake: bitbake-worker/runqueue: Avoid unnecessary bytes object copies Insu Park (1): bitbake: data: Add missing dependency handling of remove operator Jan Garcia (1): insane.bbclass: Count raw bytes in shebang-size Joshua Watt (6): classes/create-spdx-2.2: Add extra debugging for missing package files nfs-utils: Don't start nfs-statsd.service without exports nfs-utils: Add StateDirectory for systemd services bitbake: utils: Add path_is_descendant() bitbake: fetch2: git: Use path_is_descendant() instead of path for repo check classes/create-spdx-2.2: Show error if document is not found Julien Stephan (1): bitbake: bitbake: cooker: add a new function to retrieve task signatures Kai Kang (2): goarch.bbclass: not compatible with riscv32 adwaita-icon-theme: 43 -> 45.0 Khem Raj (25): perl: Add packageconfig for setlocale functionality differences libc-test: Run as non-root user coreutils: Upgrade to 9.4 coreutils: Add config.h to ptest package gettext: Add missing dependency on gawk autoconf util-linux: Disable failing tests on musl Revert "util-linux: scanf_cv_alloc_modifier changed from 'as' -> 'ms'" util-linux: Fix lscpu on musl qemu: Add PACKAGECONFIG for dax llvm: Upgrade to 17.0.1 oeqa: Use 2.14 release of cpio instead of 2.13 musl: Update to latest bsd-headers: Define __CONCAT and __STRING mesa: Update clang-17 patch to upstream v2 musl-legacy-error: Add recipe elfutils: Depend on musl-legacy-error for musl targets debugedit: Use musl-legacy-error systemd: Drop two upstreamed musl patches systemd: Refresh patches to avoid patch-fuzz glib-2.0: Enable possible locales with musl for ptests glib-2.0: Remove failing ptests on musl llvm: Upgrade to 17.0.2 createrepo-c: Fix function declaration bug found with clang mesa: Simplify llvm-17 patch mesa: Fix native build on hosts with llvm-dev installed Lee Chee Yang (2): bind: update to 9.18.19 cups: fix CVE-2023-4504 Markus Volk (8): mesa: upgrade 23.1.3 -> 23.1.7 libportal: upgrade 0.6 -> 0.7.1 appstream: import recipe from meta-oe libadwaita: upgrade 1.3.4 -> 1.4.0 maintainers.inc: add missing entries for appstream and libxmlb libxmlb: import recipe from meta-oe pulseaudio: dont include consolekit for systemd mesa: Upgrade 23.1.7 -> 23.1.8 Marta Rybczynska (3): python3-ply: add to nativesdk python3-isodate: add homepage python3-rdflib: add homepage Martin Jansa (3): gcc: backport a fix for ICE caused by CVE-2023-4039.patch fontcache.bbclass: avoid native recipes depending on target fontconfig multilib_script.bbclass: expand script name as well Matthias Schnelte (1): bitbake: fetch2: Adds vscode devcontainer support Michael Opdenacker (18): base: add newline before LICENSE_FLAGS_DETAILS dev-manual: new-recipe.rst fix inconsistency with contributor guide contributor-guide: recipe-style-guide: add Upstream-Status dev-manual: licenses: update license manifest location dev-manual: licenses: mention SPDX for license compliance dev-manual: disk-space: improve wording for obsolete sstate cache files sdk-manual: extensible.rst: fix multiple formatting issues alsa-lib: upgrade 1.2.9 -> 1.2.10 alsa-utils: upgrade 1.2.9 -> 1.2.10 shadow: fix patch Upstream-Status libevent: fix patch Upstream-Status alsa-utils: update patch Upstream-Status alsa-lib: fix patch Upstream-Status lib/oe/qa: remove obsolete "Accepted" string for Upstream-Status lib/oe/qa: update guidelines link for Upstream-Status bsp-guide: bsp.rst: replace reference to wiki dev-manual: new-recipe.rst: replace reference to wiki maintainers.inc: add self for flac recipe Mikko Rapeli (9): openssh: update Upstream-Status to Denied in test logging patch openssh: improve banner ptest failure logging testimage.bbclass: detect slirp from TEST_RUNQEMUPARAMS oeqa dnf_runtime.py: fix HTTP server IP address and port oeqa selftest runtime_test.py: append to TEST_RUNQEMUPARAMS selftest runtime_test.py: add testimage.bbclass slirp test openssh: capture logs in run-ptest testimage.bbclass: remove QEMU_USE_SLIRP variable oeqa/selftest/context.py: check git command return values Ninad Palsule (1): kernel-fitImage: Strip path component from dtb Peter Kjellerstedt (7): libsoup-2.4: Only specify --cross-file when building for target libsoup: Only specify --cross-file when building for target bitbake: tinfoil: Do not fail when logging is disabled and full config is used bitbake: bitbake-getvar: Make --quiet work with --recipe bitbake: bitbake-getvar: Make --value imply --quiet bitbake: bitbake-getvar: Add a (suppressable) error for undefined variables bitbake: bitbake-getvar: Treat undefined variables as empty with --value Peter Marko (2): openssl: Upgrade 3.1.2 -> 3.1.3 json-c: define CVE_VERSION Qiu Tingting (1): tar: add ptest support Richard Purdie (34): bitbake.conf: Add IMAGE_BASENAME to SDK_NAME vim: Upgrade 9.0.1664 -> 9.0.1894 defaultsetup: Inherit create-spdx by default oeqa/selftest/runtime_test: No need to use append with TEST_RUNQEMUPARAMS devtool/build_sdk: Drop unused imports bitbake: lib: Drop inotify support and replace with mtime checks bitbake: server/process: Disable the flush() call in server logging recipetool/devtool: Ensure server knows about changed files lttng-tools: Upgrade 2.13.10 -> 2.13.11 oeqa/selftest/wic: Improve assertTrue calls elfutils: Fix reproducibility issue with bunzip2 bitbake: cooker: Drop unneeded flush calls sstate: Fix nativesdk entry in SSTATE_ARCHS multilib: fix SSTATE_ARCHS for multilib usage license/license_image: Fix license file layout to avoid overlapping files oeqa/selftest/bbtests: Improve and update test_non_gplv3 create-spdx/sbom: Ensure files don't overlap between machines sstate: Stop allowing overlapping symlinks from sstate recipes: Drop remaining PR values from recipes bitbake.conf: No longer support PR from filename oeqa/selftest: Fix broken symlink removal handling oeqa/selftest/reproducible: Avoid oe-selftest startup delays oeqa: Streamline oe-selftest startup time oeqa/selftest/oescripts: Avoid variable access at module load bitbake: codeparser: Update debug variable reference contributor-guide/style-guide: Refer to recipes, not packages contributor-guide/style-guide: Add a note about task idempotence lib: Import packagedata oe module by default oeqa/runner: Ensure class setup errors are shown to bitbake logging create-spdx: Ensure it is clear where the message comes from oeqa/utils/gitarchive: Handle broken commit counts in results repo python3-numpy: Fix reproducibility issue scritps/runqemu: Ensure we only have two serial ports glibc: Pull in stable branch fixes Robert Joslyn (2): curl: Update from 8.2.1 to 8.3.0 curl: Skip tests marked flaky Robert Yang (1): libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt Roland Hieber (7): template: fix typo in section header ref-manual: point outdated link to the new location contributor-guide: recipe-style-guide: add more patch tagging examples contributor-guide: recipe-style-guide: add section about CVE patches contributor-guide: discourage marking patches as Inappropriate contributor-guide: deprecate "Accepted" patch status contributor-guide: style-guide: discourage using Pending patch status Ross Burton (19): packagegroup-core-x11-xserver: add modesetting driver to default XSERVER machine/qemu*: add modesetting drivers to XSERVER beaglebone-yocto: remove redundant XSERVER assignment gcc: Fix -fstack-protector issue on aarch64 testimage: respect target/server IPs when using slirp manuals: document LICENSE_FLAGS_DETAILS linux-yocto: update CVE ignores libwebp: upgrade to 1.3.2 oeqa/runtime/parselogs: remove unused imports oeqa/runtime/parselogs: don't bother to show target hardware information oeqa/runtime/parselogs: remove obsolete LSB testing support oeqa/runtime/parselogs: inline single-caller functions oeqa/runtime/parselogs: improve find call oeqa/runtime/parselogs: don't pass around members oeqa/runtime/parselogs: move some variables out of global scope oeqa/runtime/parselogs: select the correct machine-specific ignores early oeqa/runtime/parselogs: parse the logs with Python, not grep webkitgtk: reduce size of -dbg package bitbake: bitbake/lib: spawn server/worker using the current Python interpreter Samantha Jalabert (14): python3-isodate: Copy recipe from meta-python python3-booleanpy: Copy recipe from meta-python python3-beartype: add recipe python3-click: Copy recipe from meta-python ptest-packagelists.inc: add python test click python3-license-expression: Copy recipe from meta-python ptest-packagelists.inc: add python test license-expression python3-rdflib: Copy recipe from meta-python python3-uritools: add recipe python3-xmltodict: Copy recipe from meta-python ptest-packagelists.inc: add python test xmltodict python3-spdx-tools: add recipe qa: Add selftest for python3-spdx-tools maintainers.inc: add python3-spdx-tools and dependencies Sean Nyekjaer (1): gcc: depend on zstd Stefan Tauner (1): gdb: fix RDEPENDS for PACKAGECONFIG[tui] Stephan Wurm (1): python3-jsonschema: Update homepage URL Tim Orling (1): python3-cryptography{-vectors}: upgrade to 41.0.4 Trevor Gamblin (6): patchtest: Add tests from patchtest oe repo patchtest/selftest: remove configurable target patchtest: add requirements.txt patchtest: Add README.md for selftests python3-ptest: skip test_input_no_stdout_fileno patchtest/selftest: only split resultlines once Ulrich Ölmann (1): packagegroup-base: clean up setting packagegroup-machine-base's SUMMARY Wang Mingyu (36): alsa-ucm-conf: upgrade 1.2.9 -> 1.2.10 at-spi2-core: upgrade 2.48.3 -> 2.48.4 dbus: upgrade 1.14.8 -> 1.14.10 debianutils: upgrade 5.8 -> 5.12 dnf: upgrade 4.16.1 -> 4.17.0 harfbuzz: upgrade 8.1.1 -> 8.2.0 kexec-tools: upgrade 2.0.26 -> 2.0.27 libinput: upgrade 1.23.0 -> 1.24.0 libnl: upgrade 3.7.0 -> 3.8.0 nghttp2: upgrade 1.55.1 -> 1.56.0 ccache: upgrade 4.8.2 -> 4.8.3 pkgconf: upgrade 2.0.2 -> 2.0.3 python3-git: upgrade 3.1.34 -> 3.1.35 python3-hypothesis: upgrade 6.84.0 -> 6.84.3 python3-pyelftools: upgrade 0.29 -> 0.30 python3-pytest: upgrade 7.4.1 -> 7.4.2 python3-setuptools: upgrade 68.1.2 -> 68.2.1 strace: upgrade 6.4 -> 6.5 stress-ng: upgrade 0.16.04 -> 0.16.05 wayland-utils: upgrade 1.1.0 -> 1.2.0 wireless-regdb: upgrade 2023.05.03 -> 2023.09.01 at-spi2-core: upgrade 2.48.4 -> 2.50.0 enchant2: upgrade 2.5.0 -> 2.6.1 harfbuzz: upgrade 8.2.0 -> 8.2.1 kbd: upgrade 2.6.2 -> 2.6.3 libsecret: upgrade 0.21.0 -> 0.21.1 gobject-introspection: upgrade 1.78.0 -> 1.78.1 python3-numpy: upgrade 1.25.2 -> 1.26.0 python3-hypothesis: upgrade 6.84.3 -> 6.86.2 python3-pycryptodome: upgrade 3.18.0 -> 3.19.0 python3-pycryptodomex: upgrade 3.18.0 -> 3.19.0 python3-smmap: upgrade 5.0.0 -> 6.0.0 python3-trove-classifiers: upgrade 2023.8.7 -> 2023.9.19 python3-typing-extensions: upgrade 4.7.1 -> 4.8.0 python3-urllib3: upgrade 2.0.4 -> 2.0.5 python3-zipp: upgrade 3.16.2 -> 3.17.0 Yash Shinde (1): glibc: fix CVE-2023-4527 Yogita Urade (2): tiff: fix CVE-2023-40745 tiff: fix CVE-2023-41175 meta-openembedded: eff1b182c1..ea42cec2ec: Alex Kiernan (2): mdns: Upgrade 1790.80.10 -> 2200.0.8 jq: Upgrade 1.6+git -> 1.7 Archana Polampalli (2): python3-appdirs: print ptest results in unified format nodejs: upgrade 18.17.1 -> 20.5.1 Armin Kuster (1): openldap: update to 2.5.16. Bruce Ashfield (2): zfs: update to v2.2.0-rc4 vboxguestdrivers: fix kernel v6.5 build Chi Xu (1): mariadb: Add ptest support Clément Péron (6): etcd-cpp-apiv3: upgrade 0.14.3 -> 0.15.3 devtools: grpc: bump to 1.56.2 protobuf: upgrade 4.22.2 -> 4.23.4 protobuf-c: bump to next release to support protobuf 4.23.x mariadb: add missing <cstdint> in rocksdb string_util.h etcd-cpp-apiv3: fix build when gRPC is cross compiled Daniel Semkowicz (2): cockpit: Move packagekit to a separate package cockpit: Move apps to a separate package Derek Straka (54): python3-absl: Update version 1.4.0 -> 2.0.0 python3-brotli: Update version 1.0.9 -> 1.1.0 python3-cachecontrol: Update version 0.13.0 -> 0.13.1 python3-cantools: Update version 38.0.2 -> 39.2.0 python3-cerberus: Update version 1.3.4 -> 1.3.5 python3-configshell-fb: Update version 1.1.29 -> 1.1.30 python3-custom-inherit: Update version 2.3.1 -> 2.4.1 python3-distlib: Update version 0.3.6 -> 0.3.7 python3-fasteners: Update version 0.18 -> 0.19 python3-filelock: Update version 3.12.0 -> 3.12.4 python3-bleak: Update version 0.20.2 -> 0.21.1 python3-dynamic-dispatch: Correct the upstream regex check for version upgrades python3-google-api-python-client: Update version 2.99.0 -> 2.100.0 python3-sqlalchemy: Upgrade 2.0.20 -> 2.0.21 python3-netaddr: Update version 0.8.0 -> 0.9.0 python3-msgpack: Update version 1.0.5 -> 1.0.6 python3-protobuf: Update version 4.24.2 -> 4.24.3 python3-gevent: Update version 23.7.0 -> 23.9.1 python3-langtable: Update version 0.0.63 -> 0.0.64 python3-posix-ipc: Update version 1.0.5 -> 1.1.1 python3-websocket-client: Update version 1.5.3 -> 1.6.3 python3-web3: Update version 6.9.0 -> 6.10.0 python3-apiflask: Update version 2.0.1 -> 2.0.2 python3-argh: Update version 0.29.3 -> 0.29.4 python3-async-timeout: remove old version of the library python3-pydantic: Update version 1.10.7 -> 2.4.1 python3-pyhamcrest: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX python3-pyasn1-modules: Update version 0.2.8 -> 0.3.0 python-pyiface: Update version from git -> 0.0.11 python3-pymysql: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX python3-pymysql: update verion 1.0.2 -> 1.1.0 python3-pyproj: update version 3.6.0 -> 3.6.1 python3-pyproject-api: update version 1.5.1 -> 1.6.1 python3-redis: update version 5.0.0 -> 5.0.1 python3-traitlets: update version 5.9.0 -> 5.10.1 python3-xxhash: update version 3.2.0 -> 3.3.0 python3-pyzmq: update version 25.0.0 -> 25.1.1 python3-cachecontrol: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX python3-flask-babel: update version 2.0.0 -> 3.1.0 python3-idna-ssl: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX python3-ninja-syntax: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX python3-prettytable: update version 3.6.0 -> 3.9.0 python3-pytz-deprecation-shim: Remove outdated recipe meant to be a short lived shim python3-tzlocal: Remove dependency on pytz_deprecation_shim removed in release 5.0 python3-astroid: update version 2.16.6 -> 3.0.0 python3-flask: update version 2.3.2 -> 2.3.3 python3-google-api-core: update version 2.12.0 python3-google-api-python-client: update version 2.100.0 -> 2.101.0 python3-google-auth: update version 2.23.0 -> 2.23.1 python3-parse-type: update version 0.5.2 -> 0.6.2 python3-nacl: Add recipe for the latest release of PyNaCl python3-botocore: add recipe for latest version of botocore python3-boto3: add recipe for latest version of boto3 python3-flask-cors: add initial version of the recipe for 4.0.0 Etienne Cordonnier (1): uutils-coreutils: upgrade 0.0.20 -> 0.0.21 Gianfranco Costamagna (3): mosquitto: do not automatically depend on dlt-daemon, it's a non-mandatory logging system mosquitto: upgrade 2.0.15 -> 2.0.17 mosquitto: upgrade 2.0.17 -> 2.0.18 Jeffrey Pautler (1): bolt: disable CVE checking for this recipe Jonas Gorski (1): frr: upgrade 8.4.4 -> 9.0.1 Julian Haller (1): openct: Fix typo in SUMMARY variable Kai Kang (1): ostree: not compatible with riscv32 when ptest enabled Khem Raj (25): vlc: Fix build with gettext 0.22+ usbguard: Enable seccomp if distro features have it sharutils: Check for intmax_t using configure poco: Add pass/fail ststus into logs mongodb: Add rdep on tzdata-core mongodb: Upgrade to 4.4.24 meta-oe-ptest-image-poco: Increase size tp 1G poco: Fix ptest runtime errors poco: Do not enable MongoDB packageconfig by default plocate: Upgrade to 1.1.19 release xscreensaver: Add osuosl backup MIRROR mozjs-115: Apply autoconf tuple mismatch fix cpp-netlib: Fix build with boost 1.80+ cpp-netlib: Fix buildpaths in generated cmake files python3-pybluez: Fix patch upstream-status python3-pynetlinux: Fix patch upstream-status libnet-idn-encode: Add recipe libio-socket-ssl-perl: Change libnet-libidn-perl->libnet-idn-encode rdep for ptests libnfs: Drop -Wno-implicit-function-declaration webkitgtk3: Do not use musttail with clang on arm fftw: Fix ptest result reporting nodejs: Fix ptest result reporting relayd: Update to latest tip of trunk relayd: Fix build with clang kernel-selftest: Build headers before compiling tests Lee Chee Yang (8): libsdl: fix CVE-2022-34568 keepalived: 2.2.2 -> 2.2.8 irssi: 1.4.2 -> 1.4.4 iniparser: Fix CVE-2023-33461 opensc: fix CVE-2023-2977 x11vnc: Fix CVE-2020-29074 libvncserver: update to 0.9.14 ntpsec: 1.2.2 -> 1.2.2a Markus Volk (48): libei: add recipe libxmlb: update 0.3.10 -> 0.3.14 appstream: update 0.16.2 -> 0.16.3 webrtc-audio-processing: add recipe for 1.x pipewire: upgrade 0.3.79 -> 0.3.80 evolution-data-server: upgrade 3.48.3 -> 3.50.0 appstream: remove workaround for cross-compile libxmlb: fix a reproducibility and runtime issue with ptest tracker-miners: upgrade 3.5.0 -> 3.6.0 mozjs: upgrade 102.9.0 -> 102.15.0 tecla: add recipe polkit: upgrade 122 -> 123 tracker: upgrade 3.5.1 -> 3.6.0 libxmlb: remove recipe appstream: remove recipe gvfs: upgrade 1.51.90 -> 1.52.0 mutter: upgrade 44.3 -> 45.0 xdg-desktop-portal: upgrade 1.16.0 -> 1.18.0 gnome-boxes: upgrade 44.2 -> 45.0 gnome-session: upgrade 44.0 -> 45.0 gnome-text-editor: upgrade 44.0 -> 45.0 gnome-shell: upgrade 44.3 -> 45.0 eog: upgrade 44.3 -> 45.0 gnome-calculator: upgrade 44.0 -> 45.0 xdg-desktop-portal-gnome: upgrade 44.1 -> 45.0 gnome-calendar: upgrade 44.0 -> 45.0 gnome-software: upgrade 44.4 -> 45.0 zenity: upgrade 3.44.0 -> 3.44.2 gnome-system-monitor: upgrade 44.0 -> 45.0 webkitgtk: upgrade 2.40.5 -> 2.42.0 gnome-control-center: upgrade 44.3 -> 45.0 gnome-settings-daemon: upgrade 44.1 -> 45.0 tracker: add missing Upstream-Status gdm: upgrade 44.1 -> 45.0.1 gnome-calendar: fix reproducibility issue exiv2: Upgrade 0.27.6 -> 0.28.0 gexiv: Upgrade 0.14.0 -> 0.14.2 gjs: Upgrade 1.76.1 -> 1.78.0 mozjs: add recipe for v115 evince: Upgrade 44.2 -> 45.0 Nautilus: Upgrade 44.2.1 -> 45.0 gedit: Upgrade 44.2 -> 46.1 tepl: Upgrade 6.4.0 -> 6.8.0 libblockdev: Upgrade 2.28 -> 3.03 udisks2: Upgrade 2.9.4 -> 2.10.1 mozjs: Upgrade 102.15.0 -> 102.15.1 libnfs: dont install libnfs-config.cmake gnome-remote-desktop: Upgrade 44.2 -> 45.0 Martin Jansa (20): webrtc-audio-processing: Fix build with -Werror=return-type freeglut: return x11 to REQUIRED_DISTRO_FEATURES packagegroup-meta-multimedia: restore x11 restriction for projucer btrfsmaintenance: move btrfs-tools dependency from build-time to run-time btrfsmaintenance: drop allarch ttf-google-fira: exclude siggen dependency on fontconfig cukinia: drop allarch mdio-tools: exclude siggen dependency on mdio-netlink ot-br-posix: exclude siggen dependency on ipset mongodb: add and fix Upstream-Status mongodb: Fix build on 32bit gupnp: fix build with meson-1.2.0 minifi-cpp, mozjs-115, redis-7.2.1, pv: add missing Upstream-Status mozjs: fix filename in MULTILIB_SCRIPTS gupnp-tools: fix build with meson-1.2.0 gnome-tweaks, networkmanager-fortisslvpn, libesmtp, json-schema-validator, python3-pybluez, python3-pynetlinux, apache2: Fix Malformed Upstream-Status mozjs: use PV in MULTILIB_SCRIPTS mosquitto, etcd-cpp-apiv3: add missing Upstream-Status meta-oe/dynamic-layers: add Upstream-Status where missing meta-oe/dynamic-layers: add one more missing Upstream-Status and fix one malformed Michał Iwanicki (1): python3-pyu2f: add recipe Mingli Yu (4): minifi-cpp: Remove the buildpath issue hdf5: Upgrade to 1.14.2 vlock: Use EXTRA_CFLAGS mozjs-102: Remove the buildpath Richard Leitner (2): python3-shellingham: add recipe for v1.5.3 python3-autoflake: add recipe for v2.2.1 Ross Burton (1): webkitgtk3: reduce size of -dbg package Sam Van Den Berge (6): python3-flask-jwt-extended: add recipe python3-flask-marshmallow: add recipe python3-apispec: add recipe python3-flask-httpauth: add recipe python3-webargs: add recipe python3-apiflask: add recipe Samantha Jalabert (6): Remove python3-rdflib Remove python3-license-expression Remove python3-xmltodict Remove python3-booleanpy Remove python3-click Remove python3-isodate Samuli Piippo (1): protobuf: stage protoc binary to sysroot Sanjay Chitroda (1): netkit-telnet: Fix CVE-2022-39028 Trevor Gamblin (1): python3-aiofiles: upgrade 23.1.0 -> 23.2.1 Vyacheslav Yurkov (3): overlayfs-tools: Drop unneeded dependency overlayfs-tools: Bump up the version overlayfs-tools: Install fsck binary Wang Mingyu (42): freerdp: upgrade 2.10.0 -> 2.11.0 boost-sml: upgrade 1.1.8 -> 1.1.9 ctags: upgrade 6.0.20230827.0 -> 6.0.20230917.0 dovecot: upgrade 2.3.20 -> 2.3.21 freerdp: upgrade 2.11.0 -> 2.11.1 gensio: upgrade 2.7.5 -> 2.7.6 geoclue: upgrade 2.7.0 -> 2.7.1 hwloc: upgrade 2.9.2 -> 2.9.3 iperf3: upgrade 3.14 -> 3.15 libcloudproviders: upgrade 0.3.2 -> 0.3.4 libdeflate: upgrade 1.18 -> 1.19 libglvnd: upgrade 1.6.0 -> 1.7.0 libtommath: upgrade 1.2.0 -> 1.2.1 libcoap: upgrade 4.3.1 -> 4.3.3 python3-antlr4-runtime: upgrade 4.13.0 -> 4.13.1 python3-lazy: upgrade 1.5 -> 1.6 python3-pyfanotify: upgrade 0.2.0 -> 0.2.1 psqlodbc: upgrade 15.00.0000 -> 16.00.0000 python3-argcomplete: upgrade 3.1.1 -> 3.1.2 python3-bitstring: upgrade 4.1.1 -> 4.1.2 python3-cmake: upgrade 3.27.4.1 -> 3.27.5 python3-coverage: upgrade 7.3.0 -> 7.3.1 python3-engineio: upgrade 4.7.0 -> 4.7.1 python3-eth-utils: upgrade 2.2.0 -> 2.2.1 python3-flask-migrate: upgrade 4.0.4 -> 4.0.5 python3-flask-socketio: upgrade 5.3.5 -> 5.3.6 python3-google-api-python-client: upgrade 2.97.0 -> 2.99.0 python3-google-auth: upgrade 2.22.0 -> 2.23.0 python3-pillow: upgrade 10.0.0 -> 10.0.1 python3-pymisp: upgrade 2.4.175 -> 2.4.176 python3-pymodbus: upgrade 3.5.0 -> 3.5.2 python3-rapidjson: upgrade 1.10 -> 1.11 python3-rich: upgrade 13.5.2 -> 13.5.3 python3-term: upgrade 2.4 -> 2.5 python3-tox: upgrade 4.11.1 -> 4.11.3 python3-typeguard: upgrade 4.1.3 -> 4.1.5 python3-types-setuptools: upgrade 68.1.0.1 -> 68.2.0.0 python3-virtualenv: upgrade 20.24.4 -> 20.24.5 python3-xlsxwriter: upgrade 3.1.2 -> 3.1.3 python3-zeroconf: upgrade 0.97.0 -> 0.112.0 redis: upgrade 7.2.0 -> 7.2.1 remmina: upgrade 1.4.31 -> 1.4.32 Xiangyu Chen (3): mosh: add support of protobuf 4.22.x protobuf: upgrade 3.21.12 -> 4.22.2 protobuf-c: add support of protobuf 4.22.x Yi Zhao (1): audit: upgrade 3.1.1 -> 3.1.2 meta-arm: bd0953cc60..95789365f7: Abdellatif El Khlifi (2): arm-bsp/trusted-firmware-a: corstone1000: enable ERRATA_A35_855472 arm-bsp/u-boot: corstone1000: purge U-Boot specific DT nodes before Linux Adam Johnston (1): arm-bsp/trusted-firmware-a: Fix BL32 path if usrmerge enabled Divin Raj (1): ci,doc,kas,arm-bsp,arm: Remove support for fvp-baser-aemv8r64 machine Emekcan Aras (6): arm-bsp/optee-os: corstone1000: Handling logging syscall correctly CI: Add meta-secure-core CI: Include meta-secure-core in corstone1000 kas: corstone1000: add meta-secure-core arm-bsp/u-boot: corstone1000: introduce authenticated capsule update arm-bsp/trusted-firmware-m: Enable authenticated capsule update Javier Tia (2): optee-client: start tee-supplicant.service when teeprivX dev is detected libts: tee-udev.rules: Change ownership to tee group Jon Mason (5): arm/edk2: update to edk2-stable202308 arm/trusted-firmware-m: update to 1.8.1 arm/opencsd: update to v1.4.1 arm/scp-firmware: update to v2.13.0 README: remove reference to meta-arm-autonomy Khem Raj (1): layer.conf: update LAYERSERIES_COMPAT for nanbield Mariam Elshakfy (2): arm-bsp/optee-os: N1SDP upgrade optee-os to 3.22 arm-bsp/optee-os: N1SDP upgrade tadevkit and optee-test to 3.22 Peter Hoyes (2): CI: Allow a GitHub container registry mirror to be specified CI: Make update-repos more resilient to network issues Ross Burton (15): arm/generic-arm64: move SERIAL_CONSOLES to generic-arm64 arm/qemu-generic-arm64: force off KVM in qemu arm/generic-arm64: set XSERVER to install the modesetting driver CI: remove redundant variables in testimage.yml arm-bsp: change port mapping for SSH to port 2222 arm/apply_local_src_patches: allow use in multiple directories arm/trusted-services: pass through CMake generator arm/trusted-services: add missing pkgconfig inherit arm/trusted-services/ts-remote-test: move binary to $bindir arm/trusted-services/ts-sp-env-test: add missing DEPENDS arm/trusted-services/ts-sp-env-test: remove arm/trusted-services: use apply_local_src_patches arm/trusted-services: upgrade nanopb and fix build races CI: use a venv for sphinx CI: upgrade to Kas 4 container Xueliang Zhong (2): arm-bsp/n1sdp: update to linux yocto kernel 6.4 arm-bsp/corstone1000: bump kernel version to v6.4 meta-security: 1856a7cf43..aca6d4a9e7: Armin Kuster (10): suricata: fix build issue. suricata: Update to 7.0.0 sssd: Update to 2.9.2 openscap: update to 1.3.9 python3-privacyidea: update to 3.8.1 lkrg-module: update to 0.9.7 libhtp: update to 0.5.45 swtpm: update 0.8.1 lynis: Update to 3.0.9 scap-security-guide: Drop Poky patch and update to tip John Broadbent (1): libhoth: Update meta-raspberrypi: 6501ec892c..482d864b8f: Joshua Watt (1): rpi-base: Fix wic image kernel dependency Khem Raj (5): userland: Update to trunk from 20230419 linux-raspberrypi: Upgrade 6.1 release to latest point release 6.1.54 linux-firmware-rpidistro: Update to 20230210-5_bpo11+1 bluez-firmware-rpidistro: Update to 1.2-4+rpt10 raspberrypi-firmware: Update to 20230509~buster Martin Jansa (1): layer.conf: update LAYERSERIES_COMPAT for nanbield Change-Id: Id75112a3b0be4bd150dc5d9a28c01982ed48200e Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
author: Andrew Geissler <geissonator@yahoo.com> 2023-10-04 18:18:08 +0300
committer: Andrew Geissler <geissonator@yahoo.com> 2023-10-10 19:23:18 +0300
commit: 220dafdb7243da3683b8a972c80a3719c2d137ef (patch)
tree: 48989211d9aee03ff7769a3169aac594816f5ef8 /poky/documentation
parent: 32d5e60788a11425a8b7bb8fc292c72c89ab7f39 (diff)
download: openbmc-220dafdb7243da3683b8a972c80a3719c2d137ef.tar.xz
10 files changed, 332 insertions, 185 deletions
diff --git a/poky/documentation/bsp-guide/bsp.rst b/poky/documentation/bsp-guide/bsp.rst
index 3be314bcf6..c78fbeb68f 100644
--- a/poky/documentation/bsp-guide/bsp.rst
+++ b/poky/documentation/bsp-guide/bsp.rst
@@ -893,8 +893,8 @@ Yocto Project:
    ``recipes-*`` subdirectories specific to the recipe's function, or
    within a subdirectory containing a set of closely-related recipes.
    The recipes themselves should follow the general guidelines for
-   recipes used in the Yocto Project found in the ":oe_wiki:`OpenEmbedded
-   Style Guide </Styleguide>`".
+   recipes found in the ":doc:`../contributor-guide/recipe-style-guide`"
+   in the Yocto Project and OpenEmbedded Contributor Guide.
 
 -  *License File:* You must include a license file in the
    ``meta-bsp_root_name`` directory. This license covers the BSP
diff --git a/poky/documentation/contributor-guide/recipe-style-guide.rst b/poky/documentation/contributor-guide/recipe-style-guide.rst
index a0d513e8e9..a005aa3247 100644
--- a/poky/documentation/contributor-guide/recipe-style-guide.rst
+++ b/poky/documentation/contributor-guide/recipe-style-guide.rst
@@ -7,17 +7,18 @@ Recipe Naming Conventions
 =========================
 
 In general, most recipes should follow the naming convention
-``recipes-category/package/packagename_version.bb``. Recipes for related
-projects may share the same package directory. ``packagename``, ``category``,
-and ``package`` may contain hyphens, but hyphens are not allowed in ``version``.
+``recipes-category/recipename/recipename_version.bb``. Recipes for related
+projects may share the same recipe directory. ``recipename`` and ``category``
+may contain hyphens, but hyphens are not allowed in ``version``.
 
 If the recipe is tracking a Git revision that does not correspond to a released
-version of the software, ``version`` may be ``git`` (e.g. ``packagename_git.bb``)
+version of the software, ``version`` may be ``git`` (e.g. ``recipename_git.bb``)
+and the recipe would set :term:`PV`.
 
 Version Policy
 ==============
 
-Our versions follow the form ``<package epoch>:<package version>-<package revision>``
+Our versions follow the form ``<epoch>:<version>-<revision>``
 or in BitBake variable terms ${:term:`PE`}:${:term:`PV`}-${:term:`PR`}. We
 generally follow the `Debian <https://www.debian.org/doc/debian-policy/ch-controlfields.html#version>`__
 version policy which defines these terms.
@@ -26,7 +27,7 @@ In most cases the version :term:`PV` will be set automatically from the recipe
 file name. It is recommended to use released versions of software as these are
 revisions that upstream are expecting people to use.
 
-Package versions should always compare and sort correctly so that upgrades work
+Recipe versions should always compare and sort correctly so that upgrades work
 as expected. With conventional versions such as ``1.4`` upgrading ``to 1.5``
 this happens naturally, but some versions don't sort. For example,
 ``1.5 Release Candidate 2`` could be written as ``1.5rc2`` but this sorts after
@@ -62,7 +63,7 @@ Version Number Changes
 
 The :term:`PR` variable is used to indicate different revisions of a recipe
 that reference the same upstream source version. It can be used to force a
-new version of a package to be installed onto a device from a package feed.
+new version of a recipe to be installed onto a device from a package feed.
 These once had to be set manually but in most cases these can now be set and
 incremented automatically by a PR Server connected with a package feed.
 
@@ -255,3 +256,144 @@ Tips and Guidelines for Writing Recipes
 -  Use :term:`BBCLASSEXTEND` instead of creating separate recipes such as ``-native``
    and ``-nativesdk`` ones, whenever possible. This avoids having to maintain multiple
    recipe files at the same time.
+
+-  Recipes should have tasks which are idempotent, i.e. that executing a given task
+   multiple times shouldn't change the end result. The build environment is built upon
+   this assumption and breaking it can cause obscure build failures.
+
+-  For idempotence when modifying files in tasks, it is usually best to:
+
+   - copy a file ``X`` to ``X.orig`` (only if it doesn't exist already)
+   - then, copy ``X.orig`` back to ``X``,
+   - and, finally, modify ``X``.
+
+   This ensures if rerun the task always has the same end result and the
+   original file can be preserved to reuse. It also guards against an
+   interrupted build corrupting the file.
+
+Patch Upstream Status
+=====================
+
+In order to keep track of patches applied by recipes and ultimately reduce the
+number of patches that need maintaining, the OpenEmbedded build system
+requires information about the upstream status of each patch.
+
+In its description, each patch should provide detailed information about the
+bug that it addresses, such as the URL in a bug tracking system and links
+to relevant mailing list archives.
+
+Then, you should also add an ``Upstream-Status:`` tag containing one of the
+following status strings:
+
+``Pending``
+   No determination has been made yet, or patch has not yet been submitted to
+   upstream.
+
+   Keep in mind that every patch submitted upstream reduces the maintainance
+   burden in OpenEmbedded and Yocto Project in the long run, so this patch
+   status should only be used in exceptional cases if there are genuine
+   obstacles to submitting a patch upstream; the reason for that should be
+   included in the patch.
+
+``Submitted [where]``
+   Submitted to upstream, waiting for approval. Optionally include where
+   it was submitted, such as the author, mailing list, etc.
+
+``Backport [version]``
+   Accepted upstream and included in the next release, or backported from newer
+   upstream version, because we are at a fixed version.
+   Include upstream version info (e.g. commit ID or next expected version).
+
+``Denied``
+   Not accepted by upstream, include reason in patch.
+
+``Inactive-Upstream [lastcommit: when (and/or) lastrelease: when]``
+   The upstream is no longer available. This typically means a defunct project
+   where no activity has happened for a long time --- measured in years. To make
+   that judgement, it is recommended to look at not only when the last release
+   happened, but also when the last commit happened, and whether newly made bug
+   reports and merge requests since that time receive no reaction. It is also
+   recommended to add to the patch description any relevant links where the
+   inactivity can be clearly seen.
+
+``Inappropriate [reason]``
+   The patch is not appropriate for upstream, include a brief reason on the
+   same line enclosed with ``[]``. In the past, there were several different
+   reasons not to submit patches upstream, but we have to consider that every
+   non-upstreamed patch means a maintainance burden for recipe maintainers.
+   Currently, the only reasons to mark patches as inappropriate for upstream
+   submission are:
+
+   -  ``oe specific``: the issue is specific to how OpenEmbedded performs builds
+      or sets things up at runtime, and can be resolved only with a patch that
+      is not however relevant or appropriate for general upstream submission.
+   -  ``upstream ticket <link>``: the issue is not specific to Open-Embedded
+      and should be fixed upstream, but the patch in its current form is not
+      suitable for merging upstream, and the author lacks sufficient expertise
+      to develop a proper patch. Instead the issue is handled via a bug report
+      (include link).
+
+Of course, if another person later takes care of submitting this patch upstream,
+the status should be changed to ``Submitted [where]``, and an additional
+``Signed-off-by:`` line should be added to the patch by the person claiming
+responsibility for upstreaming.
+
+Examples
+--------
+
+Here's an example of a patch that has been submitted upstream::
+
+   rpm: Adjusted the foo setting in bar
+
+   [RPM Ticket #65] -- http://rpm5.org/cvs/tktview?tn=65,5
+
+   The foo setting in bar was decreased from X to X-50% in order to
+   ensure we don't exhaust all system memory with foobar threads.
+
+   Upstream-Status: Submitted [rpm5-devel@rpm5.org]
+
+   Signed-off-by: Joe Developer <joe.developer@example.com>
+
+A future update can change the value to ``Backport`` or ``Denied`` as
+appropriate.
+
+Another example of a patch that is specific to OpenEmbedded::
+
+   Do not treat warnings as errors
+
+   There are additional warnings found with musl which are
+   treated as errors and fails the build, we have more combinations
+   than upstream supports to handle.
+
+   Upstream-Status: Inappropriate [oe specific]
+
+Here's a patch that has been backported from an upstream commit::
+
+   include missing sys/file.h for LOCK_EX
+
+   Upstream-Status: Backport [https://github.com/systemd/systemd/commit/ac8db36cbc26694ee94beecc8dca208ec4b5fd45]
+
+CVE patches
+===========
+
+In order to have a better control of vulnerabilities, patches that fix CVEs must
+contain a ``CVE:`` tag. This tag list all CVEs fixed by the patch. If more than
+one CVE is fixed, separate them using spaces.
+
+CVE Examples
+------------
+
+This should be the header of patch that fixes :cve:`2015-8370` in GRUB2::
+
+   grub2: Fix CVE-2015-8370
+
+   [No upstream tracking] -- https://bugzilla.redhat.com/show_bug.cgi?id=1286966
+
+   Back to 28; Grub2 Authentication
+
+   Two functions suffer from integer underflow fault; the grub_username_get() and grub_password_get()located in
+   grub-core/normal/auth.c and lib/crypto.c respectively. This can be exploited to obtain a Grub rescue shell.
+
+   Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/grub.git/commit/?id=451d80e52d851432e109771bb8febafca7a5f1f2]
+   CVE: CVE-2015-8370
+   Signed-off-by: Joe Developer <joe.developer@example.com>
diff --git a/poky/documentation/dev-manual/disk-space.rst b/poky/documentation/dev-manual/disk-space.rst
index a84bef4511..6d1638a302 100644
--- a/poky/documentation/dev-manual/disk-space.rst
+++ b/poky/documentation/dev-manual/disk-space.rst
@@ -23,12 +23,12 @@ final disk usage of 22 Gbytes instead of &MIN_DISK_SPACE; Gbytes. However,
 &MIN_DISK_SPACE_RM_WORK; Gbytes of initial free disk space are still needed to
 create temporary files before they can be deleted.
 
-Purging Duplicate Shared State Cache Files
-==========================================
+Purging Obsolete Shared State Cache Files
+=========================================
 
 After multiple build iterations, the Shared State (sstate) cache can contain
-duplicate cache files for a given package, consuming a substantial amount of
-disk space. However, only the most recent cache files are likeky to be reusable.
+multiple cache files for a given package, consuming a substantial amount of
+disk space. However, only the most recent ones are likely to be reused.
 
 The following command is a quick way to purge all the cache files which
 haven't been used for a least a specified number of days::
diff --git a/poky/documentation/dev-manual/licenses.rst b/poky/documentation/dev-manual/licenses.rst
index 9629dc5329..3b9190d47f 100644
--- a/poky/documentation/dev-manual/licenses.rst
+++ b/poky/documentation/dev-manual/licenses.rst
@@ -123,6 +123,13 @@ name and version (after variable expansion)::
 
    LICENSE_FLAGS = "license_${PN}_${PV}"
 
+It is possible to give more details about a specific license
+using flags on the :term:`LICENSE_FLAGS_DETAILS` variable::
+
+   LICENSE_FLAGS_DETAILS[my-eula-license] = "For further details, see https://example.com/eula."
+
+If set, this will be displayed to the user if the license hasn't been accepted.
+
 In order for a component restricted by a
 :term:`LICENSE_FLAGS` definition to be enabled and included in an image, it
 needs to have a matching entry in the global
@@ -298,19 +305,34 @@ There are other requirements beyond the scope of these three and the
 methods described in this section (e.g. the mechanism through which
 source code is distributed).
 
-As different organizations have different methods of complying with open
-source licensing, this section is not meant to imply that there is only
-one single way to meet your compliance obligations, but rather to
-describe one method of achieving compliance. The remainder of this
-section describes methods supported to meet the previously mentioned
-three requirements. Once you take steps to meet these requirements, and
-prior to releasing images, sources, and the build system, you should
-audit all artifacts to ensure completeness.
+As different organizations have different ways of releasing software,
+there can be multiple ways of meeting license obligations. At
+least, we describe here two methods for achieving compliance:
+
+-  The first method is to use OpenEmbedded's ability to provide
+   the source code, provide a list of licenses, as well as
+   compilation scripts and source code modifications.
+
+   The remainder of this section describes supported methods to meet
+   the previously mentioned three requirements.
+
+-  The second method is to generate a *Software Bill of Materials*
+   (:term:`SBoM`), as described in the ":doc:`/dev-manual/sbom`" section.
+   Not only do you generate :term:`SPDX` output which can be used meet
+   license compliance requirements (except for sharing the build system
+   and layers sources for the time being), but this output also includes
+   component version and patch information which can be used
+   for vulnerability assessment.
+
+Whatever method you choose, prior to releasing images, sources,
+and the build system, you should audit all artifacts to ensure
+completeness.
 
 .. note::
 
    The Yocto Project generates a license manifest during image creation
-   that is located in ``${DEPLOY_DIR}/licenses/``\ `image_name`\ ``-``\ `datestamp`
+   that is located in
+   ``${DEPLOY_DIR}/licenses/<image-name>-<machine>.rootfs-<datestamp>/``
    to assist with any audits.
 
 Providing the Source Code
@@ -428,7 +450,7 @@ with source as defined by the GPL and other open source licenses.
 Providing Compilation Scripts and Source Code Modifications
 -----------------------------------------------------------
 
-At this point, we have addressed all we need to prior to generating the
+At this point, we have addressed all we need prior to generating the
 image. The next two requirements are addressed during the final
 packaging of the release.
 
diff --git a/poky/documentation/dev-manual/new-recipe.rst b/poky/documentation/dev-manual/new-recipe.rst
index cb9533ff5d..02bb08474f 100644
--- a/poky/documentation/dev-manual/new-recipe.rst
+++ b/poky/documentation/dev-manual/new-recipe.rst
@@ -1036,13 +1036,14 @@ build system and package managers, so the resulting packages will not
 correctly trigger an upgrade.
 
 In order to ensure the versions compare properly, the recommended
-convention is to set :term:`PV` within the
-recipe to "previous_version+current_version". You can use an additional
-variable so that you can use the current version elsewhere. Here is an
-example::
+convention is to use a tilde (``~``) character as follows::
 
-   REALPV = "0.8.16-rc1"
-   PV = "0.8.15+${REALPV}"
+  PV = 0.8.16~rc1
+
+This way ``0.8.16~rc1`` sorts before ``0.8.16``. See the
+":ref:`contributor-guide/recipe-style-guide:version policy`" section in the
+Yocto Project and OpenEmbedded Contributor Guide for more details about
+versioning code corresponding to a pre-release or to a specific Git commit.
 
 Post-Installation Scripts
 =========================
@@ -1394,9 +1395,9 @@ doing the following:
 Following Recipe Style Guidelines
 =================================
 
-When writing recipes, it is good to conform to existing style
-guidelines. The :oe_wiki:`OpenEmbedded Styleguide </Styleguide>` wiki page
-provides rough guidelines for preferred recipe style.
+When writing recipes, it is good to conform to existing style guidelines.
+See the ":doc:`../contributor-guide/recipe-style-guide`" in the Yocto Project
+and OpenEmbedded Contributor Guide for reference.
 
 It is common for existing recipes to deviate a bit from this style.
 However, aiming for at least a consistent style is a good idea. Some
diff --git a/poky/documentation/migration-guides/release-notes-4.3.rst b/poky/documentation/migration-guides/release-notes-4.3.rst
index c19cf6e4f9..87cd622743 100644
--- a/poky/documentation/migration-guides/release-notes-4.3.rst
+++ b/poky/documentation/migration-guides/release-notes-4.3.rst
@@ -10,6 +10,8 @@ New Features / Enhancements in 4.3
 
 -  New variables:
 
+   -  :term:`FILE_LAYERNAME`: bitbake now sets this to the name of the layer containing the recipe
+
    -  :term:`FIT_ADDRESS_CELLS` and :term:`UBOOT_FIT_ADDRESS_CELLS`.
       See details below.
 
@@ -17,7 +19,8 @@ New Features / Enhancements in 4.3
 
    -  :term:`KERNEL_DTBVENDORED`: whether to keep vendor subdirectories.
 
-   -  :term:`FILE_LAYERNAME`: bitbake now sets this to the name of the layer containing the recipe
+   -  :term:`LICENSE_FLAGS_DETAILS`: add extra details about a recipe license
+      in case it is not allowed by :term:`LICENSE_FLAGS_ACCEPTED`.
 
 - Layername functionality available through overrides
 
diff --git a/poky/documentation/ref-manual/qa-checks.rst b/poky/documentation/ref-manual/qa-checks.rst
index 6fdb0fbde9..4a02e7206a 100644
--- a/poky/documentation/ref-manual/qa-checks.rst
+++ b/poky/documentation/ref-manual/qa-checks.rst
@@ -754,7 +754,7 @@ Errors and Warnings
 
 - ``Missing Upstream-Status in patch <patchfile> Please add according to <url> [patch-status-core/patch-status-noncore]``
 
-    The Upstream-Status value is missing in the specified patch file's header.
+    The ``Upstream-Status`` value is missing in the specified patch file's header.
     This value is intended to track whether or not the patch has been sent
     upstream, whether or not it has been merged, etc.
 
@@ -762,13 +762,13 @@ Errors and Warnings
     recipes in OE-Core) and ``patch-status-noncore`` (for recipes in any other
     layer).
 
-    For more information on setting Upstream-Status see:
-    https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status
-
+    For more information, see the
+    ":ref:`contributor-guide/recipe-style-guide:patch upstream status`"
+    section in the Yocto Project and OpenEmbedded Contributor Guide.
 
 - ``Malformed Upstream-Status in patch <patchfile> Please correct according to <url> [patch-status-core/patch-status-noncore]``
 
-    The Upstream-Status value in the specified patch file's header is invalid -
+    The ``Upstream-Status`` value in the specified patch file's header is invalid -
     it must be a specific format. See the "Missing Upstream-Status" entry above
     for more information.
 
diff --git a/poky/documentation/ref-manual/variables.rst b/poky/documentation/ref-manual/variables.rst
index 7a71abc0ae..11523bb9e7 100644
--- a/poky/documentation/ref-manual/variables.rst
+++ b/poky/documentation/ref-manual/variables.rst
@@ -4968,6 +4968,23 @@ system and gives an overview of their function and contents.
       ":ref:`dev-manual/licenses:enabling commercially licensed recipes`"
       section in the Yocto Project Development Tasks Manual.
 
+   :term:`LICENSE_FLAGS_DETAILS`
+      Adds details about a flag in :term:`LICENSE_FLAGS`. This way,
+      if such a flag is not accepted through :term:`LICENSE_FLAGS_ACCEPTED`,
+      the error message will be more informative, containing the specified
+      extra details.
+
+      For example, a recipe with an EULA may set::
+
+         LICENSE_FLAGS = "FooBar-EULA"
+         LICENSE_FLAGS_DETAILS[FooBar-EULA] = "For further details, see https://example.com/eula."
+
+      If ``Foobar-EULA`` isn't in :term:`LICENSE_FLAGS_ACCEPTED`, the
+      error message is more useful::
+
+        Has a restricted license 'FooBar-EULA' which is not listed in your LICENSE_FLAGS_ACCEPTED.
+        For further details, see https://example.com/eula.
+
    :term:`LICENSE_PATH`
       Path to additional licenses used during the build. By default, the
       OpenEmbedded build system uses :term:`COMMON_LICENSE_DIR` to define the
diff --git a/poky/documentation/sdk-manual/extensible.rst b/poky/documentation/sdk-manual/extensible.rst
index 9e08e57a4e..355c6cb0e4 100644
--- a/poky/documentation/sdk-manual/extensible.rst
+++ b/poky/documentation/sdk-manual/extensible.rst
@@ -48,18 +48,20 @@ Extensible SDK can be installed in two different ways, and both have
 their own pros and cons:
 
 #. *Setting up the Extensible SDK environment directly in a Yocto build*. This
-avoids having to produce, test, distribute and maintain separate SDK installer
-archives, which can get very large. There is only one environment for the regular
-Yocto build and the SDK and less code paths where things can go not according to plan.
-It's easier to update the SDK: it simply means updating the Yocto layers with
-git fetch or layer management tooling. The SDK extensibility is better than in the
-second option: just run ``bitbake`` again to add more things to the sysroot, or add layers
-if even more things are required.
-
-#. *Setting up the Extensible SDK from a standalone installer*. This has the benefit of
-having a single, self-contained archive that includes all the needed binary artifacts.
-So nothing needs to be rebuilt, and there is no need to provide a well-functioning
-binary artefact cache over the network for developers with underpowered laptops.
+   avoids having to produce, test, distribute and maintain separate SDK
+   installer archives, which can get very large. There is only one environment
+   for the regular Yocto build and the SDK and less code paths where things can
+   go not according to plan. It's easier to update the SDK: it simply means
+   updating the Yocto layers with git fetch or layer management tooling. The
+   SDK extensibility is better than in the second option: just run ``bitbake``
+   again to add more things to the sysroot, or add layers if even more things
+   are required.
+
+#. *Setting up the Extensible SDK from a standalone installer*. This has the
+   benefit of having a single, self-contained archive that includes all the
+   needed binary artifacts. So nothing needs to be rebuilt, and there is no
+   need to provide a well-functioning binary artefact cache over the network
+   for developers with underpowered laptops.
 
 Setting up the Extensible SDK environment directly in a Yocto build
 -------------------------------------------------------------------
@@ -67,12 +69,12 @@ Setting up the Extensible SDK environment directly in a Yocto build
 #. Set up all the needed layers and a Yocto :term:`Build Directory`, e.g. a regular Yocto
    build where ``bitbake`` can be executed.
 
-#. Run:
-    $ bitbake meta-ide-support
-    $ bitbake -c populate_sysroot gtk+3
-    (or any other target or native item that the application developer would need)
-    $ bitbake build-sysroots
+#. Run::
 
+      $ bitbake meta-ide-support
+      $ bitbake -c populate_sysroot gtk+3
+      # or any other target or native item that the application developer would need
+      $ bitbake build-sysroots
 
 Setting up the Extensible SDK from a standalone installer
 ---------------------------------------------------------
@@ -194,15 +196,13 @@ script is for an IA-based target machine using i586 tuning::
    Run devtool --help for further details.
 
 When using the environment script directly in a Yocto build, it can
-be run similarly:
+be run similarly::
 
    $ source tmp/deploy/images/qemux86-64/environment-setup-core2-64-poky-linux
 
-Running the setup script defines many environment variables needed in
-order to use the SDK (e.g. ``PATH``,
-:term:`CC`,
-:term:`LD`, and so forth). If you want to
-see all the environment variables the script exports, examine the
+Running the setup script defines many environment variables needed in order to
+use the SDK (e.g. ``PATH``, :term:`CC`, :term:`LD`, and so forth). If you want
+to see all the environment variables the script exports, examine the
 installation file itself.
 
 Using ``devtool`` in Your SDK Workflow
@@ -216,11 +216,8 @@ system.
 
 .. note::
 
-   The use of
-   devtool
-   is not limited to the extensible SDK. You can use
-   devtool
-   to help you easily develop any project whose build output must be
+   The use of ``devtool`` is not limited to the extensible SDK. You can use
+   ``devtool`` to help you easily develop any project whose build output must be
    part of an image built using the build system.
 
 The ``devtool`` command line is organized similarly to
@@ -230,15 +227,10 @@ all the commands.
 
 .. note::
 
-   See the "
-   devtool
-    Quick Reference
-   " in the Yocto Project Reference Manual for a
-   devtool
-   quick reference.
+   See the ":doc:`/ref-manual/devtool-reference`"
+   section in the Yocto Project Reference Manual.
 
-Three ``devtool`` subcommands provide entry-points into
-development:
+Three ``devtool`` subcommands provide entry-points into development:
 
 -  *devtool add*: Assists in adding new software to be built.
 
@@ -315,9 +307,8 @@ command:
 
       .. note::
 
-         If required,
-         devtool
-         always creates a Git repository locally during the extraction.
+         If required, ``devtool`` always creates a Git repository locally
+         during the extraction.
 
       Furthermore, the first positional argument ``srctree`` in this case
       identifies where the ``devtool add`` command will locate the
@@ -326,8 +317,7 @@ command:
 
          $ devtool add recipe srctree fetchuri
 
-      In summary,
-      the source code is pulled from fetchuri and extracted into the
+      In summary, the source code is pulled from fetchuri and extracted into the
       location defined by ``srctree`` as a local Git repository.
 
       Within workspace, ``devtool`` creates a recipe named recipe along
@@ -358,16 +348,14 @@ command:
 
       $ devtool edit-recipe recipe
 
-   From within the editor, you
-   can make modifications to the recipe that take effect when you build
-   it later.
+   From within the editor, you can make modifications to the recipe that
+   take effect when you build it later.
 
 #. *Build the Recipe or Rebuild the Image*: The next step you take
    depends on what you are going to do with the new code.
 
    If you need to eventually move the build output to the target
-   hardware, use the following ``devtool`` command:
-   :;
+   hardware, use the following ``devtool`` command::
 
       $ devtool build recipe
 
@@ -392,8 +380,11 @@ command:
       development machine.
 
    You can deploy your build output to that target hardware by using the
-   ``devtool deploy-target`` command: $ devtool deploy-target recipe
-   target The target is a live target machine running as an SSH server.
+   ``devtool deploy-target`` command::
+
+      $ devtool deploy-target recipe target
+
+   The target is a live target machine running as an SSH server.
 
    You can, of course, also deploy the image you build to actual
    hardware by using the ``devtool build-image`` command. However,
@@ -422,11 +413,9 @@ command:
 
    .. note::
 
-      You can use the
-      devtool reset
-      command to put things back should you decide you do not want to
-      proceed with your work. If you do use this command, realize that
-      the source tree is preserved.
+      You can use the ``devtool reset`` command to put things back should you
+      decide you do not want to proceed with your work. If you do use this
+      command, realize that the source tree is preserved.
 
 Use ``devtool modify`` to Modify the Source of an Existing Component
 --------------------------------------------------------------------
@@ -473,11 +462,9 @@ command:
 
          $ devtool modify recipe
 
-      Once
-      ``devtool``\ locates the recipe, ``devtool`` uses the recipe's
-      :term:`SRC_URI` statements to
-      locate the source code and any local patch files from other
-      developers.
+      Once ``devtool`` locates the recipe, ``devtool`` uses the recipe's
+      :term:`SRC_URI` statements to locate the source code and any local
+      patch files from other developers.
 
       With this scenario, there is no ``srctree`` argument. Consequently, the
       default behavior of the ``devtool modify`` command is to extract
@@ -513,11 +500,7 @@ command:
 
       .. note::
 
-         You cannot provide a URL for
-         srctree
-         using the
-         devtool
-         command.
+         You cannot provide a URL for ``srctree`` using the ``devtool`` command.
 
       As with all extractions, the command uses the recipe's :term:`SRC_URI`
       statements to locate the source files and any associated patch
@@ -570,7 +553,9 @@ command:
    On the other hand, if you want an image to contain the recipe's
    packages from the workspace for immediate deployment onto a device
    (e.g. for testing purposes), you can use the ``devtool build-image``
-   command: $ devtool build-image image
+   command::
+
+      $ devtool build-image image
 
 #. *Deploy the Build Output*: When you use the ``devtool build`` command
    to build out your recipe, you probably want to see if the resulting
@@ -610,8 +595,7 @@ command:
 
       Any changes you want to turn into patches must be staged and
       committed within the local Git repository before you use the
-      devtool finish
-      command.
+      ``devtool finish`` command.
 
    Because there is no need to move the recipe, ``devtool finish``
    either updates the original recipe in the original layer or the
@@ -626,11 +610,9 @@ command:
 
    .. note::
 
-      You can use the
-      devtool reset
-      command to put things back should you decide you do not want to
-      proceed with your work. If you do use this command, realize that
-      the source tree is preserved.
+      You can use the ``devtool reset`` command to put things back should you
+      decide you do not want to proceed with your work. If you do use this
+      command, realize that the source tree is preserved.
 
 Use ``devtool upgrade`` to Create a Version of the Recipe that Supports a Newer Version of the Software
 -------------------------------------------------------------------------------------------------------
@@ -644,12 +626,11 @@ counterparts.
 
 .. note::
 
-   Several methods exist by which you can upgrade recipes -
-   ``devtool upgrade``
-   happens to be one. You can read about all the methods by which you
-   can upgrade recipes in the
-   :ref:`dev-manual/upgrading-recipes:upgrading recipes` section
-   of the Yocto Project Development Tasks Manual.
+   Several methods exist by which you can upgrade recipes ---
+   ``devtool upgrade`` happens to be one. You can read about all the methods by
+   which you can upgrade recipes in the
+   :ref:`dev-manual/upgrading-recipes:upgrading recipes` section of the Yocto
+   Project Development Tasks Manual.
 
 The ``devtool upgrade`` command is flexible enough to allow you to specify
 source code revision and versioning schemes, extract code into or out of the
@@ -755,8 +736,11 @@ The following diagram shows the common development flow used with the
       development machine.
 
    You can deploy your build output to that target hardware by using the
-   ``devtool deploy-target`` command: $ devtool deploy-target recipe
-   target The target is a live target machine running as an SSH server.
+   ``devtool deploy-target`` command::
+
+      $ devtool deploy-target recipe target
+
+   The target is a live target machine running as an SSH server.
 
    You can, of course, also deploy the image you build using the
    ``devtool build-image`` command to actual hardware. However,
@@ -790,11 +774,9 @@ The following diagram shows the common development flow used with the
 
    .. note::
 
-      You can use the
-      devtool reset
-      command to put things back should you decide you do not want to
-      proceed with your work. If you do use this command, realize that
-      the source tree is preserved.
+      You can use the ``devtool reset`` command to put things back should you
+      decide you do not want to proceed with your work. If you do use this
+      command, realize that the source tree is preserved.
 
 A Closer Look at ``devtool add``
 ================================
@@ -862,10 +844,9 @@ run ``devtool add`` again and provide the name or the version.
 Dependency Detection and Mapping
 --------------------------------
 
-The ``devtool add`` command attempts to detect build-time dependencies
-and map them to other recipes in the system. During this mapping, the
-command fills in the names of those recipes as part of the
-:term:`DEPENDS` variable within the
+The ``devtool add`` command attempts to detect build-time dependencies and map
+them to other recipes in the system. During this mapping, the command fills in
+the names of those recipes as part of the :term:`DEPENDS` variable within the
 recipe. If a dependency cannot be mapped, ``devtool`` places a comment
 in the recipe indicating such. The inability to map a dependency can
 result from naming not being recognized or because the dependency simply
@@ -882,10 +863,8 @@ following to your recipe::
 
 .. note::
 
-   The
-   devtool add
-   command often cannot distinguish between mandatory and optional
-   dependencies. Consequently, some of the detected dependencies might
+   The ``devtool add`` command often cannot distinguish between mandatory and
+   optional dependencies. Consequently, some of the detected dependencies might
    in fact be optional. When in doubt, consult the documentation or the
    configure script for the software the recipe is building for further
    details. In some cases, you might find you can substitute the
@@ -895,16 +874,14 @@ following to your recipe::
 License Detection
 -----------------
 
-The ``devtool add`` command attempts to determine if the software you
-are adding is able to be distributed under a common, open-source
-license. If so, the command sets the
-:term:`LICENSE` value accordingly.
+The ``devtool add`` command attempts to determine if the software you are
+adding is able to be distributed under a common, open-source license. If
+so, the command sets the :term:`LICENSE` value accordingly.
 You should double-check the value added by the command against the
 documentation or source files for the software you are building and, if
 necessary, update that :term:`LICENSE` value.
 
-The ``devtool add`` command also sets the
-:term:`LIC_FILES_CHKSUM`
+The ``devtool add`` command also sets the :term:`LIC_FILES_CHKSUM`
 value to point to all files that appear to be license-related. Realize
 that license statements often appear in comments at the top of source
 files or within the documentation. In such cases, the command does not
@@ -984,10 +961,9 @@ mind:
 Adding Native Tools
 -------------------
 
-Often, you need to build additional tools that run on the :term:`Build
-Host` as opposed to
-the target. You should indicate this requirement by using one of the
-following methods when you run ``devtool add``:
+Often, you need to build additional tools that run on the :term:`Build Host`
+as opposed to the target. You should indicate this requirement by using one of
+the following methods when you run ``devtool add``:
 
 -  Specify the name of the recipe such that it ends with "-native".
    Specifying the name like this produces a recipe that only builds for
@@ -1011,8 +987,7 @@ Adding Node.js Modules
 ----------------------
 
 You can use the ``devtool add`` command two different ways to add
-Node.js modules: 1) Through ``npm`` and, 2) from a repository or local
-source.
+Node.js modules: through ``npm`` or from a repository or local source.
 
 Use the following form to add Node.js modules through ``npm``::
 
@@ -1027,7 +1002,7 @@ these behaviors ensure the reproducibility and integrity of the build.
 
 .. note::
 
-   -  You must use quotes around the URL. The ``devtool add`` does not
+   -  You must use quotes around the URL. ``devtool add`` does not
       require the quotes, but the shell considers ";" as a splitter
       between multiple commands. Thus, without the quotes,
       ``devtool add`` does not receive the other parts, which results in
@@ -1042,9 +1017,8 @@ repository or local source tree. To add modules this way, use
 
    $ devtool add https://github.com/diversario/node-ssdp
 
-In this example, ``devtool``
-fetches the specified Git repository, detects the code as Node.js code,
-fetches dependencies using ``npm``, and sets
+In this example, ``devtool`` fetches the specified Git repository, detects the
+code as Node.js code, fetches dependencies using ``npm``, and sets
 :term:`SRC_URI` accordingly.
 
 Working With Recipes
@@ -1121,18 +1095,13 @@ Setting Configure Arguments
 
 If the software your recipe is building uses GNU autoconf, then a fixed
 set of arguments is passed to it to enable cross-compilation plus any
-extras specified by
-:term:`EXTRA_OECONF` or
-:term:`PACKAGECONFIG_CONFARGS`
+extras specified by :term:`EXTRA_OECONF` or :term:`PACKAGECONFIG_CONFARGS`
 set within the recipe. If you wish to pass additional options, add them
 to :term:`EXTRA_OECONF` or :term:`PACKAGECONFIG_CONFARGS`. Other supported build
-tools have similar variables (e.g.
-:term:`EXTRA_OECMAKE` for
-CMake, :term:`EXTRA_OESCONS`
-for Scons, and so forth). If you need to pass anything on the ``make``
-command line, you can use :term:`EXTRA_OEMAKE` or the
-:term:`PACKAGECONFIG_CONFARGS`
-variables to do so.
+tools have similar variables (e.g.  :term:`EXTRA_OECMAKE` for CMake,
+:term:`EXTRA_OESCONS` for Scons, and so forth). If you need to pass anything on
+the ``make`` command line, you can use :term:`EXTRA_OEMAKE` or the
+:term:`PACKAGECONFIG_CONFARGS` variables to do so.
 
 You can use the ``devtool configure-help`` command to help you set the
 arguments listed in the previous paragraph. The command determines the
@@ -1156,8 +1125,7 @@ the build host.
 
 Recipes should never write files directly into the sysroot. Instead,
 files should be installed into standard locations during the
-:ref:`ref-tasks-install` task within
-the ``${``\ :term:`D`\ ``}`` directory. A
+:ref:`ref-tasks-install` task within the ``${``\ :term:`D`\ ``}`` directory. A
 subset of these files automatically goes into the sysroot. The reason
 for this limitation is that almost all files that go into the sysroot
 are cataloged in manifests in order to ensure they can be removed later
@@ -1173,14 +1141,12 @@ the target device, it is important to understand packaging because the
 contents of the image are expressed in terms of packages and not
 recipes.
 
-During the :ref:`ref-tasks-package`
-task, files installed during the
-:ref:`ref-tasks-install` task are
-split into one main package, which is almost always named the same as
-the recipe, and into several other packages. This separation exists
-because not all of those installed files are useful in every image. For
-example, you probably do not need any of the documentation installed in
-a production image. Consequently, for each recipe the documentation
+During the :ref:`ref-tasks-package` task, files installed during the
+:ref:`ref-tasks-install` task are split into one main package, which is almost
+always named the same as the recipe, and into several other packages. This
+separation exists because not all of those installed files are useful in every
+image. For example, you probably do not need any of the documentation installed
+in a production image. Consequently, for each recipe the documentation
 files are separated into a ``-doc`` package. Recipes that package
 software containing optional modules or plugins might undergo additional
 package splitting as well.
@@ -1188,8 +1154,7 @@ package splitting as well.
 After building a recipe, you can see where files have gone by looking in
 the ``oe-workdir/packages-split`` directory, which contains a
 subdirectory for each package. Apart from some advanced cases, the
-:term:`PACKAGES` and
-:term:`FILES` variables controls
+:term:`PACKAGES` and :term:`FILES` variables controls
 splitting. The :term:`PACKAGES` variable lists all of the packages to be
 produced, while the :term:`FILES` variable specifies which files to include
 in each package by using an override to specify the package. For
@@ -1231,16 +1196,11 @@ target machine.
 
 .. note::
 
-   The
-   devtool deploy-target
-   and
-   devtool undeploy-target
-   commands do not currently interact with any package management system
-   on the target device (e.g. RPM or OPKG). Consequently, you should not
-   intermingle
-   devtool deploy-target
-   and package manager operations on the target device. Doing so could
-   result in a conflicting set of files.
+   The ``devtool deploy-target`` and ``devtool undeploy-target`` commands do
+   not currently interact with any package management system on the target
+   device (e.g. RPM or OPKG). Consequently, you should not intermingle
+   ``devtool deploy-target`` and package manager operations on the target
+   device. Doing so could result in a conflicting set of files.
 
 Installing Additional Items Into the Extensible SDK
 ===================================================
@@ -1264,7 +1224,7 @@ When using the extensible SDK directly in a Yocto build
 
 In this scenario, the Yocto build tooling, e.g. ``bitbake``
 is directly accessible to build additional items, and it
-can simply be executed directly:
+can simply be executed directly::
 
    $ bitbake mesa
    $ bitbake build-sysroots
@@ -1272,6 +1232,8 @@ can simply be executed directly:
 When using a standalone installer for the Extensible SDK
 --------------------------------------------------------
 
+::
+
    $ devtool sdk-install mesa
 
 By default, the ``devtool sdk-install`` command assumes
@@ -1297,13 +1259,13 @@ To update your installed SDK, use ``devtool`` as follows::
 
    $ devtool sdk-update
 
-The previous command assumes your SDK provider has set the
-default update URL for you through the :term:`SDK_UPDATE_URL`
-variable as described in the
+The previous command assumes your SDK provider has set the default update URL
+for you through the :term:`SDK_UPDATE_URL` variable as described in the
 ":ref:`sdk-manual/appendix-customizing:Providing Updates to the Extensible SDK After Installation`"
 section. If the SDK provider has not set that default URL, you need to
-specify it yourself in the command as follows: $ devtool sdk-update
-path_to_update_directory
+specify it yourself in the command as follows::
+
+   $ devtool sdk-update path_to_update_directory
 
 .. note::
 
diff --git a/poky/documentation/template/template.svg b/poky/documentation/template/template.svg
index 43043e3afb..50715c08b0 100644
--- a/poky/documentation/template/template.svg
+++ b/poky/documentation/template/template.svg
@@ -1019,7 +1019,7 @@
          id="tspan1183-1-8"
          x="-52.348656"
          y="518.42615"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke:none">Objets</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke:none">Objects</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
author	Andrew Geissler <geissonator@yahoo.com>	2023-10-04 18:18:08 +0300
committer	Andrew Geissler <geissonator@yahoo.com>	2023-10-10 19:23:18 +0300
commit	220dafdb7243da3683b8a972c80a3719c2d137ef (patch)
tree	48989211d9aee03ff7769a3169aac594816f5ef8 /poky/documentation
parent	32d5e60788a11425a8b7bb8fc292c72c89ab7f39 (diff)
download	openbmc-220dafdb7243da3683b8a972c80a3719c2d137ef.tar.xz