summaryrefslogtreecommitdiff
path: root/poky/bitbake
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2022-07-15 22:00:58 +0300
committerAndrew Geissler <andrew@geissonator.com>2022-07-20 22:59:28 +0300
commit615f2f11d3f46e3eae642475495a7ca4cfddc49e (patch)
treed88ca73415c1690f5cc8deb783e45499aabccd3c /poky/bitbake
parentbef0021cfe167ccb6ae2e71f546ecb21ccf1c204 (diff)
downloadopenbmc-615f2f11d3f46e3eae642475495a7ca4cfddc49e.tar.xz
subtree updates
poky: ee0d001b81..4161dbbbd6: Aatir Manzur (1): docs: add CONVERSION_CMD definition Ahmed Hossam (1): insane.bbclass: host-user-contaminated: Correct per package home path Alejandro Hernandez Samaniego (1): package.bbclass: Fix base directory for debugsource files when using externalsrc Alex Kiernan (1): python3-cryptography: Cleanup DEPENDS/RDEPENDS Alexander Kanavin (53): mesa: update 22.0.3 -> 22.1.2 python3-numpy: update 1.22.3 -> 1.22.4 python3-setuptools: update 62.3.2 -> 62.5.0 vulkan: upgrade 1.3.211.0 -> 1.3.216.0 lttng-modules: update 2.13.3 -> 2.13.4 go: update 1.18.2 -> 1.18.3 ell: update 0.50 -> 0.51 libdrm: update 2.4.110 -> 2.4.111 diffoscope: upgrade 215 -> 216 dos2unix: upgrade 7.4.2 -> 7.4.3 librsvg: upgrade 2.54.3 -> 2.54.4 puzzles: upgrade to latest revision sudo: upgrade 1.9.10 -> 1.9.11p2 wireless-regdb: upgrade 2022.04.08 -> 2022.06.06 x264: upgrade to latest revision python3-requests: upgrade 2.27.1 -> 2.28.0 oeqa/sdk: drop the nativesdk-python 2.x test python3-hatch-vcs: fix upstream version check at: take tarballs from debian pango: exclude 1.9x versions which are 2.x pre-releases. adwaita-icon-theme: upgrade 41.0 -> 42.0 rust: update 1.60.0 -> 1.62.0 weston: update 10.0.0 -> 10.0.1 python3-setuptools-scm: upgrade 6.4.2 -> 7.0.3 waffle: correctly request wayland-scanner executable openssl: update 3.0.4 -> 3.0.5 diffoscope: upgrade 216 -> 217 glib-2.0: upgrade 2.72.2 -> 2.72.3 glib-networking: upgrade 2.72.0 -> 2.72.1 gstreamer1.0: upgrade 1.20.2 -> 1.20.3 harfbuzz: upgrade 4.3.0 -> 4.4.1 kmod: upgrade 29 -> 30 libsoup: upgrade 3.0.6 -> 3.0.7 mesa: upgrade 22.1.2 -> 22.1.3 mpg123: upgrade 1.29.3 -> 1.30.0 nghttp2: upgrade 1.47.0 -> 1.48.0 piglit: upgrade to latest revision pulseaudio: upgrade 16.0 -> 16.1 python3-cffi: upgrade 1.15.0 -> 1.15.1 python3-cryptography: upgrade 37.0.2 -> 37.0.3 python3-cryptography-vectors: upgrade 37.0.2 -> 37.0.3 python3-hatchling: upgrade 1.3.0 -> 1.3.1 python3-hypothesis: upgrade 6.46.11 -> 6.48.2 python3-jsonschema: upgrade 4.6.0 -> 4.6.1 python3-mako: upgrade 1.2.0 -> 1.2.1 python3-pycryptodomex: upgrade 3.14.1 -> 3.15.0 python3-requests: upgrade 2.28.0 -> 2.28.1 python3-setuptools: upgrade 62.5.0 -> 62.6.0 python3-sphinx: upgrade 5.0.0 -> 5.0.2 xcb-proto: upgrade 1.15 -> 1.15.2 procps: restrict version check to 3.x ncurses: mark upstream version as unknown wayland: update 1.20.0 -> 1.21.0 Alexandre Belloni (1): oeqa/selftest/bbtests: Update message lookup for test_git_unpack_nonetwork_fail Aryaman Gupta (5): buildstats.py: enable collection of /proc/pressure data pybootchartgui: render cpu and io pressure buildstats.bbclass: correct sampling of system stats buildstats.py: close /proc/pressure/cpu file descriptor buildperf/base.py: skip reduced_proc_pressure directory Bruce Ashfield (29): perf: fix reproducibility in 5.19+ linux-yocto/5.10: update to v5.10.121 linux-yocto/5.15: update to v5.15.46 linux-yocto/5.15: update to v5.15.48 linux-yocto/5.10: update to v5.10.123 linux-yocto-dev: bump to v5.19-rc linux-yocto/5.15: drop obselete GPIO sysfs ABI lttng-modules: fix 5.19+ build kernel-devsrc: fix reproducibility and buildpaths QA warning linux-yocto/5.15: update to v5.15.52 linux-yocto/5.10: update to v5.10.128 kernel-devsrc: ppc32: fix reproducibility linux-yocto/5.15: fix qemuppc buildpaths warning linux-yocto/5.15: fix build_OID_registry buildpaths warning yocto-bsps: update to v5.10.128 and buildpaths fixes yocto-bsps: update to v5.15.52 and buildpaths fixes linux-yocto/5.10: fix build_OID_registry/conmakehash buildpaths warning linux-yocto/5.10: fix buildpaths issue with gen-mach-types linux-yocto/5.15: fix buildpaths issue with gen-mach-types yocto-bsps/5.10: fix buildpaths issue with gen-mach-types yocto-bsps/5.15: fix buildpaths issue with gen-mach-types linux-yocto/5.15: update to v5.15.54 linux-yocto/5.15: fix buildpaths issue with pnmtologo linux-yocto/5.10: update to v5.10.130 linux-yocto/5.10: fix buildpaths issue with pnmtologo yocto-bsps/5.10: fix buildpaths issue with pnmtologo yocto-bsps/5.15: fix buildpaths issue with pnmtologo yocto-bsps: update to v5.15.54 yocto-bsps: update to v5.10.130 Christoph Lauer (1): package.bbclass: Avoid stripping signed kernel modules in splitdebuginfo David Bagonyi (1): sanity.bbclass: Add ftps to accepted URI protocols for mirrors sanity Dmitry Baryshkov (1): linux-firmware: upgrade 20220509 -> 20220610 Enrico Scholz (6): npm: replace 'npm pack' call by 'tar czf' npm: return content of 'package.json' in 'npm_pack' npm: take 'version' directly from 'package.json' npm: disable 'audit' + 'fund' lib:npm_registry: initial checkin npm: use npm_registry to cache package Federico Pellegrin (1): signing-keys: fix RDEPENDS to signing-keys-dev Gennaro Iorio (1): bitbake: fetch2: gitsm: fix incorrect handling of git submodule relative urls He Zhe (1): curl: Fix build failure for qemuriscv64 Jacob Kroon (1): bitbake: bitbake-user-manual: Correct description of the ??= operator Jose Quaresma (3): archiver: don't use machine variables in shared recipes sstate: Use the python3 ThreadPoolExecutor instead of the OE ThreadedPool oe/utils: remove the ThreadedPool Joshua Watt (1): classes/create-spdx: Add SPDX_PRETTY option Kai Kang (1): glibc-tests: not clear BBCLASSEXTEND Khem Raj (2): libmodule-build-perl: Use env utility to find perl interpreter ltp: Remove -mfpmath=sse on x86 Luca Ceresoli (1): llvm: add PACKAGECONFIG[optviewer] Lucas Stach (1): perf: sort-pmuevents: really keep array terminators Marius Kriegerowski (1): scriptutils: fix style to be more PEP8 compliant Marta Rybczynska (2): cve-check: add support for Ignored CVEs oeqa/selftest/cve_check: add tests for Ignored and partial reports Martin Jansa (3): mesa: backport a patch to support compositors without zwp_linux_dmabuf_v1 again wic: fix WicError message bitbake: fetch2/git: show SRCREV and git repo in error message about fixed SRCREV Maxime Roussin-Bélanger (1): libffi: fix native build being not portable Michael Halstead (2): releases: include 3.1.17 releases: include 4.0.2 Michael Opdenacker (18): rootfs-postcommands.bbclass: correct comments dev-manual: mention the new CVE patch metrics page dev-manual: fix references to BitBake user manual docs: standards.md: add more rules: line wrapping and variables doc: standard for bulleted lists ref-manual: add description for the "sysroot" term manuals: update host tool requirements ref-manual: document SSTATE_EXCLUDEDEPS_SYSROOT ref-manual: document SYSTEMD_DEFAULT_TARGET ref-manual: IMAGE_FEATURES: add allow-root-login and correct allow-empty-password ref-manual: correct description of empty-root-passwd in IMAGE_FEATURES bitbake: doc: bitbake-user-manual: add explicit target for crates fetcher bitbake: doc: bitbake-user-manual: document npm and npmsw fetchers dev-manual: NPM packages: minor grammar fix manuals: switch to the sstate mirror shared between all versions manuals: replace hyphens with em dashes dev-manual: update section about creating NPM packages dev-manual: improve screenshot resolution Ming Liu (3): udev-extraconf: fix some systemd automount issues meta: introduce UBOOT_MKIMAGE_KERNEL_TYPE udev-extraconf:mount.sh: fix path mismatching issues Mingli Yu (1): vim: not adjust script pathnames for native scripts either Muhammad Hamza (6): initramfs-framework: move storage mounts to actual rootfs udev-extraconf/mount.sh: add LABELs to mountpoints udev-extraconf/mount.sh: save mount name in our tmp filecache udev-extraconf/mount.sh: only mount devices on hotplug udev-extraconf: force systemd-udevd to use shared MountFlags udev-extraconf/mount.sh: ignore lvm in automount Nick Potenski (1): systemd: systemd-systemctl: Support instance conf files during enable Ola x Nilsson (1): bitbake: ConfHandler: Remove lingering close Pascal Bach (1): bin_package: install into base_prefix Paul Eggleton (4): devtool: ignore pn- overrides when determining SRC_URI overrides patch: handle if S points to a subdirectory of a git repo devtool: finish: handle patching when S points to subdir of a git repo oe-selftest: devtool: test modify git recipe building from a subdir Paulo Neves (14): python: Avoid shebang overflow on python-config.py gtk-doc: Fix potential shebang overflow on gtkdoc-mkhtml2 ref-manual: SYSTEMD_SERVICE allows multiple services ref-manual: SYSTEMD_SERVICE overrides depend on SYSTEMD_PACKAGES insane.bbclass: Make do_qa_staging check shebangs oeqa/selftest: Add test for shebang overflow oeqa/selftest: Test staged .la and .pc files utils: Add cmdline_shebang_wrapper util. libcheck: Fix too long shebang for native case. utils: create_cmdline_shebang_wrapper whitespace and sed refactor utils: create_cmdline_shebang_wrapper preserve permission and ownership oeqa/sysroot.py: Check bitbake return status bitbake: fetch: bb.fatal when trying to checksum non-existing files oeqa: test_invalid_recipe_src_uri expect parse time error Pavel Zhukov (4): systemd: Add missed sys/file.h includes for musl systemd: Rebase patches on v251 bitbake: tests/fetch: Add test for broken mirror tarball systemd: update upstream status of merged patches Peter Bergin (2): systemd: add packageconfig for sysext rust: fix issue building cross-canadian tools for aarch64 on x86_64 Peter Kjellerstedt (2): ref-manual: Add documentation for INCOMPATIBLE_LICENSE_EXCEPTIONS base.bbclass: Correct the test for obsolete license exceptions Peter Marko (1): alsa-state: correct license Pgowda (1): binutils : CVE-2019-1010204 Quentin Schulz (3): docs: releases: move hardknott and honister to outdated section docs: conf.py: bump minimum Sphinx version requirement Revert "docs: conf.py: fix cve extlinks caption for sphinx <4.0" Raju Kumar Pothuraju (2): runqemu: add QB_KERNEL_CMDLINE kernel-uboot.bbclass: Use vmlinux.initramfs when INITRAMFS_IMAGE_BUNDLE set Richard Purdie (42): gcc-source: Fix incorrect task dependencies from ${B} vim: Upgrade 8.2.5034 -> 8.2.5083 local.conf.sample: Update sstate url to new 'all' path ref/dev-manual: Update multiconfig documentation oeqa/runtime/scp: Disable scp test for dropbear unzip: Port debian fixes for two CVEs elfutils/flex: Disable parallel make ptest compile bitbake: server/process: Fix logging issues where only the first message was displayed coreutils: Tweak packaging variable names for coreutils-dev packagegroup-core-ssh-dropbear: Add openssh-sftp-server recommendation bitbake.conf/recipes: Introduce add DEV_PKG_DEPENDENCY to change RDEPENDS:${PN}-dev bitbake.conf: Change -dev RDEPENDS to RRECOMMENDS vim: 8.2.5083 -> 9.0.0005 ncurses: 6.3 -> 6.3+20220423 oe-selftest-image: Ensure the image has sftp as well as dropbear cve-extra-exclusions: Clean up and ignore three CVEs (2xqemu and nasm) openssl: Upgrade 3.0.3 -> 3.0.4 insane: Fix buildpaths test to work with special devices go: Filter build paths on staticly linked arches glibc-tests: Avoid reproducibility issues gperf: Add a patch to work around reproducibility issues bitbake: ConfHandler/BBHandler: Improve comment error messages and add tests icon-naming-utils: Resurrect for sato-icon-theme sato-icon-theme: Add back with support for scalable icons lua: Fix multilib buildpath reproducibility issues vala: Fix on target wrapper buildpaths issue gtk-doc: Remove hardcoded buildpath gperf: Switch to upstream patch qemu: Avoid accidental librdmacm linkage kernel-arch: Fix buildpaths leaking into external module compiles qemu: Fix slirp determinism issue qemu: Add PACKAGECONFIG for brlapi gcc-runtime: Fix build when using gold insane: Add buildpaths to WARN_QA by default insane: Reword staging to refer to populate_sysroot bitbake: fetch2: Ensure directory exists before creating symlink bitbake: fetch2: Drop DL_DIR fallback for local file fetcher oeqa/selftest/sstatetests: Update test to work with bitbake changes gcc-runtime: Fix missing MLPREFIX in debug mappings insane: Drop debug exclusion from buildpaths test selftest/runtime_test/virgl: Disable for all almalinux local.conf.sample: Mention other MACHINE options may exist Robert Joslyn (1): curl: Update to 7.84.0 Ross Burton (24): python3: fix a race condition in the test_socket.testSockName test Add python3-editables (from meta-python) Add python3-pathspec (from meta-python) Add python3-hatchling (from meta-oe) python3-hatch-vcs: add new recipe python3-jsonschema: upgrade 4.5.1 -> 4.6.0 package_manager: Change complementary package handling to not include soft dependencies cups: ignore CVE-2022-26691 cve-check: hook cleanup to the BuildCompleted event, not CookerExit busybox: fix CVE-2022-30065 ncurses: use GitHub mirror, not Debian's packaging ltp: remove open-posix-testsuite build logs tiff: backport the fix for CVE-2022-2056, CVE-2022-2057, and CVE-2022-2058 perl: don't install Makefile.old into perl-ptest vim: upgrade to 9.0.0021 ltp: fix builds when host ld doesn't know about target ELF formats python3-setuptools-scm: add missing python3-typing-extensions dependency python3-flit-core: bootstrap explicitly python3-installer: bootstrap by installing installer with installer python3-picobuild: add new recipe python_pep517: use picobuild instead of manually calling the API classes: remove obsolete PEP517_BUILD_API python3-hatchling: remove PEP517_BUILD_API documentation: remove obsolete PEP517_BUILD_API Steve Sakoman (3): qemu: add PACKAGECONFIG for capstone qemu: Avoid accidental libvdeplug linkage ruby: add PACKAGECONFIG for capstone Sundeep KOKKONDA (2): glibc: stable 2.35 branch updates binutils : stable 2.38 branch updates Thomas Perrot (1): opensbi: Update to v1.1 Thomas Roos (1): recipetool/devtool: Fix python egg whitespace issues in PACKAGECONFIG Xu Huan (2): python3: upgrade 3.10.4 -> 3.10.5 python3-magic: upgrade 0.4.26 -> 0.4.27 Yi Zhao (2): popt: fix override syntax in RDEPENDS git: fix override syntax in RDEPENDS Yogesh Tyagi (2): testimage : remove curl-ptest from rpm index curl : Add ptest Yue Tao (1): gnupg: upgrade to 2.3.7 to fix CVE-2022-34903 Yulong (Kevin) Liu (1): python3-pyasn1: Eliminated ptest deprecation warnings aatir (1): docs: make DISTRO_FEATURES description more explicit niko.mauno@vaisala.com (3): ptest.bbclass: Honor PARALLEL_MAKE, PARALLEL_MAKEINST valgrind: Drop redundant oe_runmake parameter strace: Drop redundant oe_runmake parameter pgowda (1): gcc: Backport a fix for gcc bug 105039 ssuesens (3): weston.py: added xwayland test weston.init: enabled xwayland xwayland.weston-start: adaption of X11-unix folder wangmy (57): btrfs-tools: upgrade 5.18 -> 5.18.1 ethtool: upgrade 5.17 -> 5.18 file: upgrade 5.41 -> 5.42 libx11: upgrade 1.8 -> 1.8.1 lighttpd: upgrade 1.4.64 -> 1.4.65 gnu-config: update to latest version musl-obstack: upgrade 1.1 -> 1.2 piglit: upgrade to latest revision stress-ng: upgrade 0.14.01 -> 0.14.02 erofs-utils: upgrade 1.4 -> 1.5 alsa-lib: upgrade 1.2.7 -> 1.2.7.1 alsa-plugins: upgrade 1.2.6 -> 1.2.7.1 alsa-ucm-conf: upgrade 1.2.7 -> 1.2.7.1 bind: upgrade 9.18.3 -> 9.18.4 kbd: upgrade 2.5.0 -> 2.5.1 libproxy: upgrade 0.4.17 -> 0.4.18 python3-dbusmock: upgrade 0.27.5 -> 0.28.0 sbc: upgrade 1.5 -> 2.0 strace: upgrade 5.17 -> 5.18 python3-chardet: upgrade 4.0.0 -> 5.0.0 python3-importlib-metadata: upgrade 4.11.4 -> 4.12.0 python3-babel: upgrade 2.10.1 -> 2.10.3 python3-certifi: upgrade 2022.5.18.1 -> 2022.6.15 python3-dbusmock: upgrade 0.28.0 -> 0.28.1 python3-numpy: upgrade 1.22.4 -> 1.23.0 python3-pycryptodome: upgrade 3.14.1 -> 3.15.0 dmidecode: upgrade 3.3 -> 3.4 git: upgrade 2.36.1 -> 2.37.0 harfbuzz: upgrade 4.3.0 -> 4.4.0 speexdsp: upgrade 1.2.0 -> 1.2.1 speex: upgrade 1.2.0 -> 1.2.1 repo: upgrade 2.26 -> 2.27 sqlite3: upgrade 3.38.5 -> 3.39.0 sudo: upgrade 1.9.11p2 -> 1.9.11p3 createrepo-c: upgrade 0.20.0 -> 0.20.1 gst-devtools: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-libav: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-omx: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-plugins-bad: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-plugins-base: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-plugins-good: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-plugins-ugly: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-python: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-rtsp-server: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-vaapi: upgrade 1.20.2 -> 1.20.3 inetutils: upgrade 2.2 -> 2.3 python3-atomicwrites: upgrade 1.4.0 -> 1.4.1 python3-cryptography: upgrade 37.0.3 -> 37.0.4 python3-cryptography-vectors: upgrade 37.0.3 -> 37.0.4 python3-hatchling: upgrade 1.3.1 -> 1.5.0 python3-imagesize: upgrade 1.3.0 -> 1.4.1 python3-jsonschema: upgrade 4.6.1 -> 4.7.1 python3-numpy: upgrade 1.23.0 -> 1.23.1 python3-typing-extensions: upgrade 4.2.0 -> 4.3.0 python3-urllib3: upgrade 1.26.9 -> 1.26.10 init-system-helpers: upgrade 1.63 -> 1.64 dpkg: upgrade 1.21.8 -> 1.21.9 meta-security: 8c6fe006a1..7ad5f6a9da: Armin Kuster (32): apparmor: fix ownership issues sssd:move to dynamic networking-layer layer.conf:add meta-netorking to BBFILES_DYNAMIC packagegroup-core-security: drop sssd packagegroup-core-security.bbappend: add sssd oeqa: fix checksec runtime test sssd: use example conf file oeqa: sssd.py fix tests sssd: update to 2.7.1 security-test-image: auto include layers if present. smack-test: more py3 covertion oeqa: update smack runtime test aide: add a few more config options oeqa: add aide test libmhash: add native pkg support classes: add aide routines aide: add native support for build time db creation aide.conf: adjust to allow for build time db creation firejail: Add new package oeqa: Add a very basic firejail test packagegroup-core-security: add firejail security-test-image: add firejail and aide test suites oeqa/clamav drop depricated --list-mirror test oeqa: meta-tpm shut swtpm down before and after testing oeqa: shut done swtpm before and after testing ccs-tools: update to 1.8.9 lynis: update to 3.0.8 README: update email address packagegroup-core-security: skip mips firejail chipsec: update to 1.8.5 security-build-image: add lkrg-module to build image lkrg: update to 0.9.3 Jeremy A. Puhlman (2): clamav: make install owner match the added user name python3-privacyidea: add correct path to lib/privacyidea Jose Quaresma (1): meta-integrity: kernel-modsign: prevents splitting out debug symbols Yi Zhao (1): aide: fix typo meta-openembedded: 11df15765c..31c10bd3e6: Adrian Freihofer (3): firewalld: update to 1.1.1 fixes ptest firewalld: upgrade 1.1.1 -> 1.2.0 libqmi: upgrade 1.30.4 -> 1.30.8 Akash Hadke (2): ntfs-3g-ntfsprogs: Set CVE_PRODUCT to "tuxera:ntfs-3g" iperf: Set CVE_PRODUCT to "iperf_project:iperf" Alex Kiernan (2): jansson: Upgrade 2.13.1 -> 2.14 nftables: Upgrade 1.0.2 -> 1.0.4 Alex Stewart (1): openvpn: distribute sample-config-files Andreas Müller (1): glmark2: Build with meson Andrej Valek (1): poco: upgrade 1.11.3 -> 1.12.0 Andrew Davis (1): libsdl: The libsdl and libsdl2 are not virtual Ashish Sharma (1): netserver: don't change permissions on /dev/null Aurélien Bertron (1): fix(syslog-ng): warning about conf version Bartosz Golaszewski (1): python3-pybluez: fix a runtime issue with python 3.10 Ben Powell (1): python3-can: Add typing-extensions dependency Changqing Li (3): chrony: create /var/lib/chrony by systemd-tmpfiles redis: upgrade 6.2.6 -> 6.2.7 redis: upgrade 7.0.0 to 7.0.2 Chen Qi (2): apache2: split out a new package apache2-utils ntfs-3g-ntfsprogs: upgrade to 2022.5.17 Daide Li (1): python3-iperf: initial add 0.1.11 Davide Gardenal (9): usrsctp: add CVE_VERSION to correctly check for CVEs ntp: ignore many CVEs openflow: ignore CVE-2018-1078 emlog: ignore unrelated CVEs imagemagick: upgrade 7.0.10-25 -> 7.0.10-62 wireshark: upgrade 3.4.11 -> 3.4.12 thrift: add CVE_PRODUCT to fix CVE reporting spice: ignore patched CVEs quagga: ignore CVE-2016-4049 Fabien Parent (1): gpsd-machine-conf: allow creation of an empty package Harshal (1): lldpd: upgrade 1.0.8 -> 1.0.14 Hitendra Prajapati (1): cyrus-sasl: CVE-2022-24407 failure to properly escape SQL input allows an attacker to execute arbitrary SQL commands Jan Vermaete (1): netdata: version bump 1.34.1 -> 1.35.0 Javier Viguera (1): networkmanager: fix build with enabled ppp Jeremy Puhlman (1): freeradius: mutlilib fixes Jonas Gorski (1): abseil-cpp: do not enforce -mfpu=neon on arm Kai Kang (4): libdbi-perl: fix interpreter on shebang line libdev-checklib-perl: fix interpreter of script use-devel-checklib libparse-yapp-perl: update interpreter of yapp python3-flatbuffer: enable native Khem Raj (8): libxml++: Disable parallel make in ptest compile geos: Disable inlining php: Fix absolute paths to php in phar.phar scripts libspiro: Add recipe fontforge: Upgrade to 20220308 opencv: Link with libatomic on mips fontforge: Use alternate way to detect libm opencv: Link with libatomic on rv32 Leon Anavi (19): python3-traitlets: Upgrade 5.2.1 -> 5.3.0 python3-humanize: Upgrade 4.1.0 -> 4.2.0 python3-autobahn: Upgrade 22.4.2 -> 22.5.1 python3-elementpath: Upgrade 2.5.0 -> 2.5.3 python3-eth-hash: Upgrade 0.3.2 -> 0.3.3 python3-serpent: Upgrade 1.40 -> 1.41 python3-web3: Upgrade 5.29.1 -> 5.29.2 python3-pika: Upgrade 1.2.1 -> 1.3.0 python3-tabulate: Upgrade 0.8.9 -> 0.8.10 python3-marshmallow: Upgrade 3.15.0 -> 3.17.0 python3-pychromecast: Upgrade 12.1.3 -> 12.1.4 python3-humanize: Upgrade 4.2.0 -> 4.2.3 python3-tornado: Upgrade 6.1 -> 6.2 python3-coverage: Upgrade 6.3.2 -> 6.4.1 python3-email-validator: Upgrade 1.1.3 -> 1.2.1 python3-networkx: Upgrade 2.7.1 -> 2.8.4 python3-unidiff: Upgrade 0.7.3 -> 0.7.4 python3-toolz: Upgrade 0.11.2 -> 0.12.0 python3-ansi2html: Upgrade 1.7.0 -> 1.8.0 Marcus Flyckt (1): python3-pyconnman: Add 'future' runtime dependency Markus Volk (1): flatbuffers: update to 2.0.6 Martin Jansa (3): glmark2: fix compatibility with python-3.11 leveldb: switch from master branch to main tesseract-lang: switch from master branch to main Mikko Rapeli (1): polkit: switch back to mozjs but leave duktape as PACKAGECONFIG option Mingli Yu (3): kronosnet: Fix build with gcc-12 s-nail: Fix build with gcc-12 mariadb: Upgrade to 10.8.3 Pascal Bach (1): python3-pybind11: upgrade 2.8.1 -> 2.9.2 Peter Kjellerstedt (1): cryptsetup: Add support for building without SSH tokens Ross Burton (5): python3-cbor2: upgrade 5.4.2 to 5.4.3 cppzmq: fix -dev RDEPENDS python3-hatchling: remove (now in oe-core) python3-pathspec: remove (now in oe-core) python3-editables: remove (now in oe-core) Sakib Sajal (1): minicoredumper: retry elf parsing as long as needed Theodore A. Roth (1): crda: Depend on correct wireless-regdb package Wentao Zhang (1): protobuf-c: update to 1.4.1 fix CVE-2022-33070 Xu Huan (20): python3-lxml: upgrade 4.8.0 -> 4.9.0 python3-msgpack: upgrade 1.0.3 -> 1.0.4 python3-protobuf: upgrade 3.20.1 -> 4.21.1 python3-mypy: upgrade 0.960 -> 0.961 python3-pylint: upgrade 2.13.9 -> 2.14.1 python3-smbus2: upgrade 0.4.1 -> 0.4.2 python3-pillow: upgrade 9.0.1 -> 9.1.1 python3-pychromecast: upgrade 12.1.2 -> 12.1.3 python3-pylint: upgrade 2.14.1 -> 2.14.3 python3-pyscaffold: upgrade 4.2.2 -> 4.2.3 python3-redis: upgrade 4.3.1 -> 4.3.3 python3-aiohue: upgrade 4.4.1 -> 4.4.2 python3-astroid: upgrade 2.11.5 -> 2.11.6 python3-charset-normalizer: upgrade 2.0.12 -> 2.1.0 python3-colorama: upgrade 0.4.4 -> 0.4.5 python3-eth-typing: upgrade 3.0.0 -> 3.1.0 python3-autobahn: upgrade 22.5.1 -> 22.6.1 python3-awesomeversion: upgrade 22.5.2 -> 22.6.0 python3-grpcio: upgrade 1.45.0 -> 1.47.0 python3-lxml: upgrade 4.9.0 -> 4.9.1 Yi Zhao (12): openldap: pass correct URANDOM_DEVICE to CPPFLAGS openvpn: eliminate build path from openvpn --version option grubby: fix syntax for ALTERNATIVE duktape: fix override syntax in RDEPENDS polkit-group-rule-udisks2: fix override syntax in RDEPENDS libcrypt-openssl-guess-perl: fix syntax for PROVIDES evince: fix typo for RRECOMMENDS blueman: fix typo for RRECOMMENDS dnsmasq: Security fix CVE-2022-0934 strongswan: upgrade 5.9.5 -> 5.9.6 openvpn: add PACKAGECONFIG for systemd openvpn: add PACKAGECONFIG for selinux Yue Tao (2): exo: upgrade 4.16.3 -> 4.16.4 dlt-daemon: upgrade to commit 6a3bd901d8 to fix CVE-2022-31291 Zoltán Böszörményi (5): opencv: Upgrade to version 4.6.0 proj: Upgrade to 8.2.1 python3-pyproj: New recipe for pyproj version 3.3.1 geos: Upgrade to 3.9.3 libspatialite: Upgrade to 5.0.1 jybros (1): clinfo: use virtual opencl loader provider wangmy (72): python3-cantools: upgrade 37.0.7 -> 37.1.0 python3-regex: upgrade 2022.4.24 -> 2022.6.2 python3-sqlalchemy: upgrade 1.4.36 -> 1.4.37 python3-twine: upgrade 4.0.0 -> 4.0.1 python3-waitress: upgrade 2.1.1 -> 2.1.2 python3-xmlschema: upgrade 1.11.0 -> 1.11.1 gspell: upgrade 1.10.0 -> 1.11.1 ctags: upgrade 5.9.20220529.0 -> 5.9.20220605.0 feh: upgrade 3.8 -> 3.9 inotify-tools: upgrade 3.22.1.0 -> 3.22.6.0 apache2: upgrade 2.4.53 -> 2.4.54 libnftnl: upgrade 1.2.1 -> 1.2.2 nbdkit: upgrade 1.31.7 -> 1.31.8 irssi: upgrade 1.2.3 -> 1.4.1 musl-nscd: upgrade 1.0.2 -> 1.1.0 rdma-core: upgrade 40.0 -> 41.0 snort: upgrade 2.9.19 -> 2.9.20 php: upgrade 8.1.6 -> 8.1.7 poco: upgrade 1.11.2 -> 1.11.3 pyxdg: upgrade 0.27 -> 0.28 syslog-ng: upgrade 3.36.1 -> 3.37.1 dnf-plugin-tui: Added postatinstall python3-dill: upgrade 0.3.4 -> 0.3.5.1 python3-robotframework-seriallibrary: upgrade 0.3.1 -> 0.4.3 python3-ujson: upgrade 5.1.0 -> 5.3.0 python3-watchdog: upgrade 2.1.8 -> 2.1.9 python3-websocket-client: upgrade 1.3.2 -> 1.3.3 gnome-commander: upgrade 1.14.2 -> 1.14.3 libwacom: upgrade 2.2.0 -> 2.3.0 nbdkit: upgrade 1.31.8 -> 1.31.9 googletest: upgrade 1.11.0 -> 1.12.0 gperftools: upgrade 2.9.1 -> 2.10 iwd: upgrade 1.27 -> 1.28 libzip: upgrade 1.8.0 -> 1.9.0 postgresql: upgrade 14.3 -> 14.4 uftrace: upgrade 0.11 -> 0.12 python3-googleapis-common-protos: upgrade 1.56.2 -> 1.56.3 python3-ifaddr: upgrade 0.1.7 -> 0.2.0 python3-jmespath: upgrade 1.0.0 -> 1.0.1 python3-pandas: upgrade 1.4.2 -> 1.4.3 python3-zeroconf: upgrade 0.38.6 -> 0.38.7 geocode-glib: upgrade 3.26.2 -> 3.26.3 gnome-bluetooth: upgrade 42.0 -> 42.1 gnome-calculator: upgrade 42.0 -> 42.2 gnome-text-editor: upgrade 42.1 -> 42.2 gtk4: upgrade 4.6.4 -> 4.6.6 gtksourceview5: upgrade 5.4.1 -> 5.4.2 gvfs: upgrade 1.50.0 -> 1.50.2 abseil-cpp: upgrade 20211102 -> 20220623 capnproto: upgrade 0.9.1 -> 0.10.2 ctags: upgrade 5.9.20220605.0 -> 5.9.20220703.0 fwupd: upgrade 1.7.6 -> 1.8.1 googletest: upgrade 1.12.0 -> 1.12.1 nautilus: upgrade 42.1.1 -> 42.2 nbdkit: upgrade 1.31.9 -> 1.31.10 openconnect: upgrade 8.20 -> 9.01 bats: upgrade 1.6.1 -> 1.7.0 cloc: upgrade 1.92 -> 1.94 hwdata: upgrade 0.360 -> 0.361 libvpx: upgrade 1.11.0 -> 1.12.0 libzip: upgrade 1.9.0 -> 1.9.2 pegtl: upgrade 3.2.5 -> 3.2.6 phoronix-test-suite: upgrade 10.8.3 -> 10.8.4 poppler: upgrade 22.06.0 -> 22.07.0 netdata: upgrade 1.35.0 -> 1.35.1 evince: upgrade 42.2 -> 42.3 gjs: upgrade 1.72.0 -> 1.72.1 gnome-bluetooth: upgrade 42.1 -> 42.2 libadwaita: upgrade 1.1.1 -> 1.1.2 liburing: upgrade 2.1 -> 2.2 libcrypt-openssl-rsa-perl: upgrade 0.32 -> 0.33 libencode-perl: upgrade 3.17 -> 3.18 zhengruoqin (23): python3-absl: upgrade 1.0.0 -> 1.1.0 python3-alembic: upgrade 1.7.7 -> 1.8.0 python3-asyncinotify: upgrade 2.0.3 -> 2.0.4 python3-crc32c: upgrade 2.2.post0 -> 2.3 python3-msk: upgrade 0.3.16 -> 0.4.0 python3-bitstruct: upgrade 8.14.1 -> 8.15.1 python3-google-api-python-client: upgrade 2.49.0 -> 2.50.0 python3-google-auth: upgrade 2.6.6 -> 2.7.0 python3-xmlschema: upgrade 1.11.1 -> 1.11.2 python3-flask-wtf: upgrade 0.15.1 -> 1.0.1 python3-gnupg: upgrade 0.4.8 -> 0.4.9 python3-google-api-python-client: upgrade 2.50.0 -> 2.51.0 python3-kiwisolver: upgrade 1.4.2 -> 1.4.3 python3-nmap: upgrade 1.5.1 -> 1.5.4 python3-asyncinotify: upgrade 2.0.4 -> 2.0.5 python3-google-auth: upgrade 2.7.0 -> 2.8.0 python3-protobuf: upgrade 4.21.1 -> 4.21.2 python3-sqlalchemy: upgrade 1.4.37 -> 1.4.39 python3-xmlschema: upgrade 1.11.2 -> 1.11.3 python3-engineio: upgrade 4.3.2 -> 4.3.3 python3-google-api-core: upgrade 2.8.0 -> 2.8.2 python3-google-auth: upgrade 2.8.0 -> 2.9.0 python3-grpcio-tools: upgrade 1.46.3 -> 1.47.0 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I22f0dab7f3253d77cc99fd462c6be45ddeb333cd
Diffstat (limited to 'poky/bitbake')
-rw-r--r--poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst78
-rw-r--r--poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst55
-rw-r--r--poky/bitbake/lib/bb/fetch2/__init__.py18
-rw-r--r--poky/bitbake/lib/bb/fetch2/git.py2
-rw-r--r--poky/bitbake/lib/bb/fetch2/gitsm.py2
-rw-r--r--poky/bitbake/lib/bb/fetch2/local.py8
-rw-r--r--poky/bitbake/lib/bb/parse/parse_py/BBHandler.py4
-rw-r--r--poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py11
-rw-r--r--poky/bitbake/lib/bb/server/process.py7
-rw-r--r--poky/bitbake/lib/bb/tests/fetch.py32
-rw-r--r--poky/bitbake/lib/bb/tests/parse.py23
11 files changed, 195 insertions, 45 deletions
diff --git a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst
index f9d9e617f3..4dfb7889e8 100644
--- a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst
+++ b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst
@@ -688,6 +688,8 @@ Here is an example URL::
It can also be used when setting mirrors definitions using the :term:`PREMIRRORS` variable.
+.. _crate-fetcher:
+
Crate Fetcher (``crate://``)
----------------------------
@@ -704,6 +706,80 @@ Here is an example URL::
SRC_URI = "crate://crates.io/glob/0.2.11"
+.. _npm-fetcher:
+
+NPM Fetcher (``npm://``)
+------------------------
+
+This submodule fetches source code from an
+`NPM <https://en.wikipedia.org/wiki/Npm_(software)>`__
+Javascript package registry.
+
+The format for the :term:`SRC_URI` setting must be::
+
+ SRC_URI = "npm://some.registry.url;OptionA=xxx;OptionB=xxx;..."
+
+This fetcher supports the following parameters:
+
+- *"package":* The NPM package name. This is a mandatory parameter.
+
+- *"version":* The NPM package version. This is a mandatory parameter.
+
+- *"downloadfilename":* Specifies the filename used when storing the downloaded file.
+
+- *"destsuffix":* Specifies the directory to use to unpack the package (default: ``npm``).
+
+Note that NPM fetcher only fetches the package source itself. The dependencies
+can be fetched through the `npmsw-fetcher`_.
+
+Here is an example URL with both fetchers::
+
+ SRC_URI = " \
+ npm://registry.npmjs.org/;package=cute-files;version=${PV} \
+ npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \
+ "
+
+See :yocto_docs:`Creating Node Package Manager (NPM) Packages
+</dev-manual/common-tasks.html#creating-node-package-manager-npm-packages>`
+in the Yocto Project manual for details about using
+:yocto_docs:`devtool <https://docs.yoctoproject.org/ref-manual/devtool-reference.html>`
+to automatically create a recipe from an NPM URL.
+
+.. _npmsw-fetcher:
+
+NPM shrinkwrap Fetcher (``npmsw://``)
+-------------------------------------
+
+This submodule fetches source code from an
+`NPM shrinkwrap <https://docs.npmjs.com/cli/v8/commands/npm-shrinkwrap>`__
+description file, which lists the dependencies
+of an NPM package while locking their versions.
+
+The format for the :term:`SRC_URI` setting must be::
+
+ SRC_URI = "npmsw://some.registry.url;OptionA=xxx;OptionB=xxx;..."
+
+This fetcher supports the following parameters:
+
+- *"dev":* Set this parameter to ``1`` to install "devDependencies".
+
+- *"destsuffix":* Specifies the directory to use to unpack the dependencies
+ (``${S}`` by default).
+
+Note that the shrinkwrap file can also be provided by the recipe for
+the package which has such dependencies, for example::
+
+ SRC_URI = " \
+ npm://registry.npmjs.org/;package=cute-files;version=${PV} \
+ npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \
+ "
+
+Such a file can automatically be generated using
+:yocto_docs:`devtool <https://docs.yoctoproject.org/ref-manual/devtool-reference.html>`
+as described in the :yocto_docs:`Creating Node Package Manager (NPM) Packages
+</dev-manual/common-tasks.html#creating-node-package-manager-npm-packages>`
+section of the Yocto Project.
+
Other Fetchers
--------------
@@ -713,8 +789,6 @@ Fetch submodules also exist for the following:
- Mercurial (``hg://``)
-- npm (``npm://``)
-
- OSC (``osc://``)
- Secure FTP (``sftp://``)
diff --git a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst
index af4b135867..337821612c 100644
--- a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst
+++ b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst
@@ -195,22 +195,45 @@ value. However, if ``A`` is not set, the variable is set to "aval".
Setting a weak default value (??=)
----------------------------------
-It is possible to use a "weaker" assignment than in the previous section
-by using the "??=" operator. This assignment behaves identical to "?="
-except that the assignment is made at the end of the parsing process
-rather than immediately. Consequently, when multiple "??=" assignments
-exist, the last one is used. Also, any "=" or "?=" assignment will
-override the value set with "??=". Here is an example::
-
- A ??= "somevalue"
- A ??= "someothervalue"
-
-If ``A`` is set before the above statements are
-parsed, the variable retains its value. If ``A`` is not set, the
-variable is set to "someothervalue".
-
-Again, this assignment is a "lazy" or "weak" assignment because it does
-not occur until the end of the parsing process.
+The weak default value of a variable is the value which that variable
+will expand to if no value has been assigned to it via any of the other
+assignment operators. The "??=" operator takes effect immediately, replacing
+any previously defined weak default value. Here is an example::
+
+ W ??= "x"
+ A := "${W}" # Immediate variable expansion
+ W ??= "y"
+ B := "${W}" # Immediate variable expansion
+ W ??= "z"
+ C = "${W}"
+ W ?= "i"
+
+After parsing we will have::
+
+ A = "x"
+ B = "y"
+ C = "i"
+ W = "i"
+
+Appending and prepending non-override style will not substitute the weak
+default value, which means that after parsing::
+
+ W ??= "x"
+ W += "y"
+
+we will have::
+
+ W = " y"
+
+On the other hand, override-style appends/prepends/removes are applied after
+any active weak default value has been substituted::
+
+ W ??= "x"
+ W:append = "y"
+
+After parsing we will have::
+
+ W = "xy"
Immediate variable expansion (:=)
---------------------------------
diff --git a/poky/bitbake/lib/bb/fetch2/__init__.py b/poky/bitbake/lib/bb/fetch2/__init__.py
index ac557176d7..0fb718b23e 100644
--- a/poky/bitbake/lib/bb/fetch2/__init__.py
+++ b/poky/bitbake/lib/bb/fetch2/__init__.py
@@ -1097,6 +1097,8 @@ def try_mirror_url(fetch, origud, ud, ld, check = False):
def ensure_symlink(target, link_name):
if not os.path.exists(link_name):
+ dirname = os.path.dirname(link_name)
+ bb.utils.mkdirhier(dirname)
if os.path.islink(link_name):
# Broken symbolic link
os.unlink(link_name)
@@ -1220,23 +1222,21 @@ def get_checksum_file_list(d):
SRC_URI as a space-separated string
"""
fetch = Fetch([], d, cache = False, localonly = True)
-
- dl_dir = d.getVar('DL_DIR')
filelist = []
for u in fetch.urls:
ud = fetch.ud[u]
-
if ud and isinstance(ud.method, local.Local):
+ found = False
paths = ud.method.localpaths(ud, d)
for f in paths:
pth = ud.decodedurl
- if f.startswith(dl_dir):
- # The local fetcher's behaviour is to return a path under DL_DIR if it couldn't find the file anywhere else
- if os.path.exists(f):
- bb.warn("Getting checksum for %s SRC_URI entry %s: file not found except in DL_DIR" % (d.getVar('PN'), os.path.basename(f)))
- else:
- bb.warn("Unable to get checksum for %s SRC_URI entry %s: file could not be found" % (d.getVar('PN'), os.path.basename(f)))
+ if os.path.exists(f):
+ found = True
filelist.append(f + ":" + str(os.path.exists(f)))
+ if not found:
+ bb.fatal(("Unable to get checksum for %s SRC_URI entry %s: file could not be found"
+ "\nThe following paths were searched:"
+ "\n%s") % (d.getVar('PN'), os.path.basename(f), '\n'.join(paths)))
return " ".join(filelist)
diff --git a/poky/bitbake/lib/bb/fetch2/git.py b/poky/bitbake/lib/bb/fetch2/git.py
index 07b3d9a7ff..4534bd7580 100644
--- a/poky/bitbake/lib/bb/fetch2/git.py
+++ b/poky/bitbake/lib/bb/fetch2/git.py
@@ -738,7 +738,7 @@ class Git(FetchMethod):
Compute the HEAD revision for the url
"""
if not d.getVar("__BBSEENSRCREV"):
- raise bb.fetch2.FetchError("Recipe uses a floating tag/branch without a fixed SRCREV yet doesn't call bb.fetch2.get_srcrev() (use SRCPV in PV for OE).")
+ raise bb.fetch2.FetchError("Recipe uses a floating tag/branch '%s' for repo '%s' without a fixed SRCREV yet doesn't call bb.fetch2.get_srcrev() (use SRCPV in PV for OE)." % (ud.unresolvedrev[name], ud.host+ud.path))
# Ensure we mark as not cached
bb.fetch2.get_autorev(d)
diff --git a/poky/bitbake/lib/bb/fetch2/gitsm.py b/poky/bitbake/lib/bb/fetch2/gitsm.py
index c5c23d5260..c1950e4819 100644
--- a/poky/bitbake/lib/bb/fetch2/gitsm.py
+++ b/poky/bitbake/lib/bb/fetch2/gitsm.py
@@ -88,7 +88,7 @@ class GitSM(Git):
subrevision[m] = module_hash.split()[2]
# Convert relative to absolute uri based on parent uri
- if uris[m].startswith('..'):
+ if uris[m].startswith('..') or uris[m].startswith('./'):
newud = copy.copy(ud)
newud.path = os.path.realpath(os.path.join(newud.path, uris[m]))
uris[m] = Git._get_repo_url(self, newud)
diff --git a/poky/bitbake/lib/bb/fetch2/local.py b/poky/bitbake/lib/bb/fetch2/local.py
index e7d1c8c58f..0bb987c644 100644
--- a/poky/bitbake/lib/bb/fetch2/local.py
+++ b/poky/bitbake/lib/bb/fetch2/local.py
@@ -57,12 +57,6 @@ class Local(FetchMethod):
logger.debug2("Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":"))))
newpath, hist = bb.utils.which(filespath, path, history=True)
searched.extend(hist)
- if not os.path.exists(newpath):
- dldirfile = os.path.join(d.getVar("DL_DIR"), path)
- logger.debug2("Defaulting to %s for %s" % (dldirfile, path))
- bb.utils.mkdirhier(os.path.dirname(dldirfile))
- searched.append(dldirfile)
- return searched
return searched
def need_update(self, ud, d):
@@ -78,8 +72,6 @@ class Local(FetchMethod):
filespath = d.getVar('FILESPATH')
if filespath:
locations = filespath.split(":")
- locations.append(d.getVar("DL_DIR"))
-
msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n " + "\n ".join(locations)
raise FetchError(msg)
diff --git a/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py b/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py
index ee9bd760ce..68415735fd 100644
--- a/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -178,10 +178,10 @@ def feeder(lineno, s, fn, root, statements, eof=False):
if s and s[0] == '#':
if len(__residue__) != 0 and __residue__[0][0] != "#":
- bb.fatal("There is a comment on line %s of file %s (%s) which is in the middle of a multiline expression.\nBitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change." % (lineno, fn, s))
+ bb.fatal("There is a comment on line %s of file %s:\n'''\n%s\n'''\nwhich is in the middle of a multiline expression. This syntax is invalid, please correct it." % (lineno, fn, s))
if len(__residue__) != 0 and __residue__[0][0] == "#" and (not s or s[0] != "#"):
- bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s))
+ bb.fatal("There is a confusing multiline partially commented expression on line %s of file %s:\n%s\nPlease clarify whether this is all a comment or should be parsed." % (lineno - len(__residue__), fn, "\n".join(__residue__)))
if s and s[-1] == '\\':
__residue__.append(s[:-1])
diff --git a/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index b895d5b5ef..451e68dd66 100644
--- a/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -125,16 +125,21 @@ def handle(fn, data, include):
s = f.readline()
if not s:
break
+ origlineno = lineno
+ origline = s
w = s.strip()
# skip empty lines
if not w:
continue
s = s.rstrip()
while s[-1] == '\\':
- s2 = f.readline().rstrip()
+ line = f.readline()
+ origline += line
+ s2 = line.rstrip()
lineno = lineno + 1
if (not s2 or s2 and s2[0] != "#") and s[0] == "#" :
- bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s))
+ bb.fatal("There is a confusing multiline, partially commented expression starting on line %s of file %s:\n%s\nPlease clarify whether this is all a comment or should be parsed." % (origlineno, fn, origline))
+
s = s[:-1] + s2
# skip comments
if s[0] == '#':
@@ -147,8 +152,6 @@ def handle(fn, data, include):
if oldfile:
data.setVar('FILE', oldfile)
- f.close()
-
for f in confFilters:
f(fn, data)
diff --git a/poky/bitbake/lib/bb/server/process.py b/poky/bitbake/lib/bb/server/process.py
index 43790b6631..5d02c0b9f5 100644
--- a/poky/bitbake/lib/bb/server/process.py
+++ b/poky/bitbake/lib/bb/server/process.py
@@ -756,8 +756,11 @@ class ConnectionWriter(object):
process.queue_signals = True
self._send(obj)
process.queue_signals = False
- for sig in process.signal_received.pop():
- process.handle_sig(sig, None)
+ try:
+ for sig in process.signal_received.pop():
+ process.handle_sig(sig, None)
+ except IndexError:
+ pass
else:
self._send(obj)
diff --git a/poky/bitbake/lib/bb/tests/fetch.py b/poky/bitbake/lib/bb/tests/fetch.py
index 622c46a05d..7fcf57e7ea 100644
--- a/poky/bitbake/lib/bb/tests/fetch.py
+++ b/poky/bitbake/lib/bb/tests/fetch.py
@@ -468,6 +468,7 @@ class MirrorUriTest(FetcherTest):
"http://.*/.* file:///someotherpath/downloads/"
def test_urireplace(self):
+ self.d.setVar("FILESPATH", ".")
for k, v in self.replaceuris.items():
ud = bb.fetch.FetchData(k[0], self.d)
ud.setup_localpath(self.d)
@@ -693,6 +694,11 @@ class FetcherLocalTest(FetcherTest):
flst.sort()
return flst
+ def test_local_checksum_fails_no_file(self):
+ self.d.setVar("SRC_URI", "file://404")
+ with self.assertRaises(bb.BBHandledException):
+ bb.fetch.get_checksum_file_list(self.d)
+
def test_local(self):
tree = self.fetchUnpack(['file://a', 'file://dir/c'])
self.assertEqual(tree, ['a', 'dir/c'])
@@ -920,6 +926,7 @@ class FetcherNetworkTest(FetcherTest):
@skipIfNoNetwork()
def test_fetch_file_mirror_of_mirror(self):
+ self.d.setVar("FILESPATH", ".")
self.d.setVar("MIRRORS", "http://.*/.* file:///some1where/ file:///some1where/.* file://some2where/ file://some2where/.* https://downloads.yoctoproject.org/releases/bitbake")
fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d)
os.mkdir(self.dldir + "/some2where")
@@ -2895,3 +2902,28 @@ class FetchPremirroronlyNetworkTest(FetcherTest):
fetcher = bb.fetch.Fetch([self.recipe_url], self.d)
with self.assertRaises(bb.fetch2.NetworkAccess):
fetcher.download()
+
+class FetchPremirroronlyBrokenTarball(FetcherTest):
+
+ def setUp(self):
+ super(FetchPremirroronlyBrokenTarball, self).setUp()
+ self.mirrordir = os.path.join(self.tempdir, "mirrors")
+ os.mkdir(self.mirrordir)
+ self.reponame = "bitbake"
+ self.gitdir = os.path.join(self.tempdir, "git", self.reponame)
+ self.recipe_url = "git://git.fake.repo/bitbake"
+ self.d.setVar("BB_FETCH_PREMIRRORONLY", "1")
+ self.d.setVar("BB_NO_NETWORK", "1")
+ self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n")
+ self.mirrorname = "git2_git.fake.repo.bitbake.tar.gz"
+ with open(os.path.join(self.mirrordir, self.mirrorname), 'w') as targz:
+ targz.write("This is not tar.gz file!")
+
+ def test_mirror_broken_download(self):
+ import sys
+ self.d.setVar("SRCREV", "0"*40)
+ fetcher = bb.fetch.Fetch([self.recipe_url], self.d)
+ with self.assertRaises(bb.fetch2.FetchError):
+ fetcher.download()
+ stdout = sys.stdout.getvalue()
+ self.assertFalse(" not a git repository (or any parent up to mount point /)" in stdout)
diff --git a/poky/bitbake/lib/bb/tests/parse.py b/poky/bitbake/lib/bb/tests/parse.py
index 2898f9bb14..1a3b74934d 100644
--- a/poky/bitbake/lib/bb/tests/parse.py
+++ b/poky/bitbake/lib/bb/tests/parse.py
@@ -194,3 +194,26 @@ deltask ${EMPTYVAR}
self.assertTrue('addtask ignored: " do_patch"' in stdout)
#self.assertTrue('dependent task do_foo for do_patch does not exist' in stdout)
+ broken_multiline_comment = """
+# First line of comment \\
+# Second line of comment \\
+
+"""
+ def test_parse_broken_multiline_comment(self):
+ f = self.parsehelper(self.broken_multiline_comment)
+ with self.assertRaises(bb.BBHandledException):
+ d = bb.parse.handle(f.name, self.d)['']
+
+
+ comment_in_var = """
+VAR = " \\
+ SOMEVAL \\
+# some comment \\
+ SOMEOTHERVAL \\
+"
+"""
+ def test_parse_comment_in_var(self):
+ f = self.parsehelper(self.comment_in_var)
+ with self.assertRaises(bb.BBHandledException):
+ d = bb.parse.handle(f.name, self.d)['']
+