summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-core/ovmf
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2023-07-21 17:09:43 +0300
committerPatrick Williams <patrick@stwcx.xyz>2023-08-10 22:22:44 +0300
commit8f840685fb701a268141f0fcebc1d34fcd9b01de (patch)
tree49f7cc04f8447a72e1bb9f96fa4a1174cea7b435 /poky/meta/recipes-core/ovmf
parent5eea8d85a2b0bfced71508b4b97030e2dc9a5717 (diff)
downloadopenbmc-8f840685fb701a268141f0fcebc1d34fcd9b01de.tar.xz
subtree updates july 21 2023 poky,openembedded
poky: 13b646c0e1..b398c7653e: Adrian Freihofer (2): runqemu-ifdown: catch up with ifup runqemu: drop uid parameter for ifdown Alejandro Hernandez Samaniego (3): baremetal-helloworld: Fix race condition runqemu: Stop using warn() since its been deprecated runqemu: Fix automated call to runqemu-ifup Alex Kiernan (3): rootfs: Add debugfs package db file copy and cleanup rpm: Pick debugfs package db files/dirs explicitly eudev: Add group sgx to eudev package Alexander Kanavin (27): insane.bbclass: enable 32 bit time API check (as a warning) on affected architectures libxcrypt: upgrade 4.4.34 -> 4.4.35 libxml2: update 2.10.4 -> 2.11.4 ovmf: update 202302 -> 202305 lua: update 5.4.4 -> 5.4.6 cargo.bbclass: set up cargo environment in common do_compile rust-common.bbclass: move musl-specific linking fix from rust-source.inc python3-cryptography: update 39.0.2 -> 41.0.1 python3-cryptography-vectors: update 39.0.2 -> 41.0.1 python3: update 3.11.3 -> 3.11.4 diffutils: update 3.9 -> 3.10 shadow: remove dependency on pam-plugin-lastlog libpam: update 1.5.2 -> 1.5.3 librsvg: update 2.56.0 -> 2.56.1 vulkan-validation-layers: update 1.3.243 -> 1.3.250 xcb-util-cursor: add a recipe from meta-oe weston: update 11.0.1 -> 12.0.1 libdmx: update 1.1.4 -> 1.1.5 xtrans: update 1.4.0 -> 1.5.0 libproxy: fetch from git libproxy: update 0.4.18 -> 0.5.2 libssh2: update 1.10.0 -> 1.11.0 gstreamer1.0-plugins-base: enable glx/opengl support webkitgtk: update 2.38.5 -> 2.40.2 python3-cryptography: update a patch to upstream's better followup fix time64.inc: annotate and clean up recipe-specific Y2038 exceptions Revert "rootfs-postcommands.bbclass: add post func remove_unused_dnf_log_lock" Andrej Valek (3): cve-check: add option to add additional patched CVEs oeqa/selftest/cve_check: rework test to new cve status handling cve_check: convert CVE_CHECK_IGNORE to CVE_STATUS Anuj Mittal (7): rpm: backport fix to prevent crashes with latest sqlite sqlite3: upgrade 3.41.2 -> 3.42.0 vte: upgrade 0.72.1 -> 0.72.2 libpng: upgrade 1.6.39 -> 1.6.40 glib-networking: upgrade 2.76.0 -> 2.76.1 bluez5: upgrade 5.66 -> 5.68 selftest/cases/glibc.py: fix the override syntax BELOUARGA Mohamed (9): bitbake: fetch2/npmsw: Add support for the new format of the shrinkwrap file bitbake: fetch2/npmsw: Don't fetch dev dependencies when they are not demanded bitbake: fetch2/npm: Remove special caracters that causes recipe tool to fail recipetool: create: npm: Remove duplicate function to not have future conflicts classes: npm: Handle peer dependencies for npm packages recipetool: create: npm: Add support for the new format of the shrinkwrap file recipetool: create: npm: Add support to handle peer dependencies classes: npm: Add support for the new format of the shrinkwrap file classe-recipes: npm: Add support for dependencies and devDependencies Benjamin Bouvier (1): util-linux: add alternative links for ipcs,ipcrm Bruce Ashfield (19): perf: fix buildpaths QA warning in 6.4+ linux-libc-headers: bump to 6.4 kernel: fix localversion in v6.3+ linux-yocto: introduce 6.4 reference kernel recipes linux-yocto/6.4: update to latest linux-yocto/6.4: aufs6 integration linux-yocto/6.4: refresh configuration linux-yocto-rt/6.4: integrate -rt6 linux-yocto/6.4: update to v6.4.2 linux-yocto-tiny/6.4: fix configuration warnings (HID) linux-yocto-tiny/arm: fix configuration warnings (HID) linux-yocto/ppc: add elfutils-native to DEPENDS linux-yocto/6.1: update to v6.1.36 linux-yocto/6.1: update to v6.1.37 linux-yocto/6.1: update to v6.1.38 linux-yocto/6.x: cfg: update ima.cfg to match current meta-integrity linux-yocto/6.4: update to v6.4.3 kernel: set HOSTPKG_CONFIG to use pkg-config-native linux-yocto/6.4: fix menuconfig Changqing Li (2): dnf: only write the log lock to root for native dnf rootfs-postcommands.bbclass: add post func remove_unused_dnf_log_lock Denys Dmytriyenko (1): bitbake: runqueue: convert deferral messages from bb.note to bb.debug Enrico Scholz (1): shadow-sysroot: add license information Etienne Cordonnier (2): libxcrypt: fix hard-coded ".so" extension qemu: fix typo Fabio Estevam (3): u-boot: Update Upstream-Status u-boot: Upgrade to 2023.07 u-boot: Upgrade to 2023.07.02 Frederic Martinsons (1): ptest-cargo.bbclass: fix condition to detect test executable Joe Slater (1): ghostscript: advance to version 10.01.2 Jose Quaresma (12): kernel: config modules directories are handled by kernel-module-split kernel-module-split: install config modules directories only when they are needed kernel-module-split: use context manager to open files kernel-module-split: make autoload and probeconf distribution specific kernel-module-split add systemd modulesloaddir and modprobedir config pybootchartgui: calcule elapsed_time when starting the loop pybootchartgui: concatenate the elapsed time with the process pybootchartgui: fix overlapping argument in render_processes_chart pybootchartgui: fix width max usage in draw_label_in_box openssl: add PERLEXTERNAL path to test its existence openssl: use a glob on the PERLEXTERNAL to track updates on the path go: update 1.20.5 -> 1.20.6 Julien Stephan (1): automake: fix buildtest patch Khem Raj (9): ffmpeg: Fix build on riscv libpam: Fix examples build on musl webkitgtk: Enable JIT on RISCV64 musl: Guard fallocate64 with _LARGEFILE64_SOURCE alsa-lib: Disable old API symbols mesa: Fix build with upcoming LLVM 17 meson.bbclass: Point to llvm-config from native sysroot webkitgtk: Unbreak build on platforms using pvr graphics drivers python3-lxml: upgrade 4.9.2 -> 4.9.3 Martin Jansa (4): selftest: multiconfig-image-packager: try to respect IMAGE_LINK_NAME kernel-devicetree: install dtb files without -${KERNEL_DTB_NAME} suffix image-artifact-names: include ${IMAGE_NAME_SUFFIX} directly in both ${IMAGE_NAME} and ${IMAGE_LINK_NAME} cpio: respect MLPREFIX for PACKAGE_WRITE_DEPS Michael Halstead (1): resulttool/resultutils: allow index generation despite corrupt json Mingli Yu (1): qemu: Add qemu-user-* and qemu-system-* to PACKAGES_DYNAMIC Natasha Bailey (1): tiff: backport a fix for CVE-2023-26965 Ovidiu Panait (5): mdadm: fix util-linux ptest dependency mdadm: fix 07revert-inplace ptest mdadm: fix segfaults when running ptests mdadm: skip running known broken ptests mdadm: re-add mdadm-ptest to PTESTS_SLOW Peter Hoyes (5): bitbake: bitbake: tests/fetch: Mark TestTimeout as not a test suite bitbake: bitbake: tests/fetch: Rename assertRaisesRegexp to assertRaisesRegex bitbake: bitbake: tests/fetch: Set git config if not already set bitbake: bitbake: tests: Use assertLogs to test logging output bitbake: bitbake: Bootstrap pytest for self-tests Peter Marko (4): cve-update-nvd2-native: fix cvssV3 metrics gcsections: apply section removal also in C++, not only in C cve-update-nvd2-native: retry all errors and sleep between retries cve-update-nvd2-native: increase retry count Piotr Łobacz (1): bitbake.conf: Add acl distro native features support Quentin Schulz (1): uboot-extlinux-config.bbclass: fix old override syntax in comment Richard Purdie (14): defaultsetup: Enable largefile and 64bit time_t support systemwide for 32 bit platforms time64: Disable CFLAGS for strace bitbake: runqueue: Fix deferred task/multiconfig race issue strace: Update patches/tests with upstream fixes bitbake: fetch2/npmsw: Support old and new shrinkwrap formats ptest-runner: Pull in "runner: Remove threads and mutexes" fix bitbake: server/process: Show command in timeout message bitbake: cooker: Log when parsing starts in server log gcc-testsuite: Fix ppc cpu specification ptest-runner: Pull in parallel test fixes and output handling oeqa/selftest/rust: Various fixes to work correctly bitbake: runqueue: Add pressure change logging build-appliance-image: Update to master head revision glibc-testsuite: Fix network restrictions causing test failures Ross Burton (26): cve-update-db-native: remove cve-update-nvd2-native: handle all configuration nodes, not just first cve-update-nvd2-native: use exact times, don't truncate ghostscript: remove CVE_CHECK_IGNORE for CVE-2013-6629 pkgconf: update SRC_URI libjpeg-turbo: upgrade to 3.0.0 cups: upgrade to 2.4.6 tiff: upgrade to 4.5.1 linux-yocto/cve-exclusion: move entries from cve-extra-exclusions linux-yocto/cve-exclusion: ignore more backported CVEs python3: fix missing comma in get_module_deps3.py python3-jsonpointer: upgrade to 2.4 oeqa/runtime/cases/rpm: fix wait_for_no_process_for_user failure case cml1: add showconfig task to easily find the generated .config file rootfs_rpm: don't depend on opkg-native for update-alternatives poky: add Debian 12 to supported distribution list cve-update-nvd2-native: log a little more cve-update-nvd2-native: actually use API keys gcc: don't pass --enable-standard-branch-protection machine/arch-arm64: add -mbranch-protection=standard qemuarm: pin kernel to 6.1 libdmx: remove obsolete library linux-yocto_6.1: ignore backported CVEs python3: ignore CVE-2023-36632 ltp: add RDEPENDS on findutils oeqa/ltp: rewrote LTP testcase and parser Siddharth Doshi (2): bind: Upgrade 9.18.15 -> 9.18.16 flac: Upgrade 1.4.2 -> 1.4.3 Soumya (1): perl: Fix CVE-2023-31486 Staffan Rydén (1): kernel: Fix path comparison in kernel staging dir symlinking Stéphane Veyret (1): scripts/oe-setup-builddir: copy conf-notes.txt to build dir Sudip Mukherjee (1): libssh2: disable rpath to fix curl-native build Thomas Roos (1): testimage/oeqa: Drop testimage_dump_host functionality Tim Orling (10): python3-pytest-subtests: upgrade 0.10.0 -> 0.11.0 python3-urllib3: upgrade 2.0.2 -> 2.0.3 python3-typing-extensions: upgrade 4.6.3 -> 4.7.0 python3-hypothesis: upgrade 6.79.2 -> 6.80.0 python3-pygments: upgrade 2.14.0 -> 2.15.1 python3-importlib-metadata: upgrade 6.7.0 -> 6.8.0 python3-typing-extensions: upgrade 4.7.0 -> 4.7.1 python3-cryptography{-vectors}: upgrade 41.0.1 -> 41.0.2 python3-zipp: upgrade 3.15.0 -> 3.16.2 python3-hypothesis: upgrade 6.80.0 -> 6.81.2 Trevor Gamblin (15): python3: add cgitb, zipapp ptest dependencies qemu: upgrade 8.0.0 -> 8.0.3 python3: parallelize ptests, add test_cppext dependencies python3-setuptools: upgrade 67.6.1 -> 68.0.0 diffoscope: upgrade 242 -> 243 p11-kit: upgrade 0.24.1 -> 0.25.0 diffoscope: add missing RDEPENDS and alphabetize linux-firmware: upgrade 20230515 -> 20230625 python3-trove-classifiers: upgrade 2023.5.24 -> 2023.7.6 python3-cython: upgrade 0.29.35 -> 0.29.36 icu: upgrade 72-1 -> 73-2 python3-editables: add python3-io to RDEPENDS python3: ensure ptest regression capture diffoscope: upgrade 243 -> 244 xeyes: upgrade 1.2.0 -> 1.3.0 Wang Mingyu (51): freetype: upgrade 2.13.0 -> 2.13.1 gstreamer1.0: upgrade 1.22.3 -> 1.22.4 kbd: upgrade 2.5.1 -> 2.6.0 libassuan: upgrade 2.5.5 -> 2.5.6 libksba: upgrade 1.6.3 -> 1.6.4 libmd: upgrade 1.0.4 -> 1.1.0 libsdl2: upgrade 2.26.5 -> 2.28.0 libtraceevent: upgrade 1.7.2 -> 1.7.3 libx11: upgrade 1.8.5 -> 1.8.6 lttng-ust: upgrade 2.13.5 -> 2.13.6 nettle: upgrade 3.9 -> 3.9.1 nghttp2: upgrade 1.53.0 -> 1.54.0 ccache: upgrade 4.8.1 -> 4.8.2 mesa: upgrade 23.1.1 -> 23.1.3 python3-numpy: upgrade 1.24.3 -> 1.25.0 python3-typing-extensions: upgrade 4.6.2 -> 4.6.3 xorgproto: upgrade 2022.2 -> 2023.2 python3-hatchling: upgrade 1.17.0 -> 1.18.0 python3-hypothesis: upgrade 6.75.7 -> 6.79.2 python3-importlib-metadata: upgrade 6.6.0 -> 6.7.0 python3-iso8601: upgrade 1.1.0 -> 2.0.0 python3-markupsafe: upgrade 2.1.2 -> 2.1.3 python3-pluggy: upgrade 1.0.0 -> 1.2.0 python3-pycairo: upgrade 1.23.0 -> 1.24.0 python3-pyparsing: upgrade 3.0.9 -> 3.1.0 python3-pytest: upgrade 7.3.1 -> 7.4.0 python3-ruamel-yaml: upgrade 0.17.31 -> 0.17.32 python3-sphinx-rtd-theme: upgrade 1.2.1 -> 1.2.2 xkeyboard-config: upgrade 2.38 -> 2.39 xwayland: upgrade 23.1.1 -> 23.1.2 wayland-protocols: upgrade 1.31 -> 1.32 taglib: upgrade 1.13 -> 1.13.1 libxcrypt: upgrade 4.4.35 -> 4.4.36 msmtp: upgrade 1.8.23 -> 1.8.24 libwebp: upgrade 1.3.0 -> 1.3.1 libuv: upgrade 1.45.0 -> 1.46.0 acpica: upgrade 20230331 -> 20230628 libnss-nis: upgrade 3.1 -> 3.2 harfbuzz: upgrade 7.3.0 -> 8.0.1 libproxy: upgrade 0.5.2 -> 0.5.3 nghttp2: upgrade 1.54.0 -> 1.55.1 debianutils: upgrade 5.7 -> 5.8 glib-2.0: upgrade 2.76.3 -> 2.76.4 python3-pip: upgrade 23.1.2 -> 23.2 opkg: upgrade 0.6.1 -> 0.6.2 opkg-utils: upgrade 0.5.0 -> 0.6.2 python3-editables: upgrade 0.3 -> 0.4 python3-git: upgrade 3.1.31 -> 3.1.32 python3-numpy: upgrade 1.25.0 -> 1.25.1 repo: upgrade 2.34.1 -> 2.35 libva: upgrade to 2.19.0 Yash Shinde (1): oeqa/selftest: Add rust selftests Yi Zhao (1): ifupdown: install missing directories Yoann Congal (2): recipetool: Fix inherit in created -native* recipes oeqa/selftest/devtool: add unit test for "devtool add -b" Yuta Hayama (1): systemd-systemctl: fix errors in instance name expansion meta-openembedded: 2638d458a5..0e3f5e5201: Alex Kiernan (1): ostree: Upgrade 2023.4 -> 2023.5 Archana Polampalli (1): tcpreplay: upgrade 4.4.3 -> 4.4.4 Beniamin Sandu (1): mbedtls: fix builds with crypto extensions Bruce Ashfield (1): vboxguestdrivers: fix compilation against 6.4 kernel / headers Carlos Rafael Giani (3): pipewire: Disable libmysofa since it is not available in OE pipewire: Improve packageconfigs pipewire: Add dedicated aes67 package and fix rlimits.d package assignment Chee Yang Lee (1): rabbitmq-c: Fix CVE-2023-35789 Jasper Orschulko (8): python3-pytest-cov: Add initial recipe 4.1.0 python3-covdefaults: Add initial recipe 2.3.0 python3-platformdirs: Fix recipe version 3.6.0 python3-distlib: Add initial recipe 0.3.6 python3-filelock: Add initial recipe 3.12.0 python3-virtualenv: Add initial recipe 20.23.0 python3-pyproject-api: Add initial recipe 1.5.1 python3-tox: Add initial recipe 4.6.0 Joe Slater (1): libgpiod: modify RDEPENDS for ptest Justin Bronder (2): python3-asyncinotify: upgrade 3.0.1 -> 4.0.2 python3-pytest-asyncio: upgrade 0.16.0 -> 0.21.1 Kai Kang (2): libtimezonemap: rename downloaded file name fltk-native: fix libdl link issue Khem Raj (33): gupnp-av: Fix build with libxml2-2.11 and newer xcb-util-cursor: Delete recipe pidgin-sipe: Add packageconfig to turn Werror on/off fbida: Fix build on musl pcp: Update to 6.0.5 geos: Upgrade to 3.12.0 ctags: Extend to build native package libcoap: Build linker symbol file explicitly geos: Use cmake directly pcp: Fix build race sblim-sfcc: Fix build with clang17 minifi-cpp: Fix build with clang 17 python3-grpcio-tools: Upgrade to 1.56.0 python3-grpcio: Upgrade to 1.56.0 python3-grpcio: Fix build on musl python3-grpcio-tools: Fix build with musl thin-provisioning-tools: Upgrade to 1.0.4 thin-provisioning-tools: Fix build on musl. pcp: Disable parallel build crash: Fix build with glibc 2.38+ breakpad: Update to latest trunk python3-requests-toolbelt: Fix ptest failures seen with urllib3 2.0 ptest-packagelists-meta-oe: Limit mcelog to x86/x86_64 graphviz: Upgrade to 8.1.0 release emlog: Update to latest to fix build with 6.4 kernel dlm: Upgrade to 4.2.0 mdio-tools: Update to latest on trunk dlm: Fix build with linux kernel 6.4+ dlm: Do not pass -fcf-protection=full via Makefile dlm: Do not use -fcf-protection=full on arm platforms zfs: Update to 2.2.0 rc1 zfs: Disable builds on aarch64 for now dhcp-relay: Pass cross configure flags to bind build Luke Schaefer (1): nginx: Add stream Signed-off-by: Luke Schaefer <lukeschafer17@gmail.com> Marek Vasut (4): lvgl: Factor out and unify lv-drivers configuration lvgl: Add default input device configuration option linux-serial-test: Update to latest git revision libiio: enable c++ bindings Markus Volk (10): pipewire: upgrade 0.3.71 -> 0.3.72 pipewire: upgrade 0.3.72 -> 0.3.73 gnome-software: upgrade 44.2 -> 44.3 eog: upgrade 44.2 -> 44.3 spdlog: upgrade 1.11.0 -> 1.12.0 flatpak: update dependencies gnome-control-center: upgrade 44.2 -> 44.3 gnome-shell: upgrade 44.2 -> 44.3 mutter: upgrade 44.2 -> 44.3 gnome-settings-daemon: upgrade 44.0 -> 44.1 Martin Jansa (4): nodejs: use PIE for host binaries gupnp: backport a fix not to use deprecated xmlReadMemory pidgin-sipe: allow to build with libxml2-2.11 raptor2: backport a fix to build with libxml2-2.11 Michael Haener (1): nginx: upgrade to 1.24.0 release Michael Weiß (1): pv: Show progress bar even if no terminal is set as in 1.6.6 Mingli Yu (1): snort: Add systemd unit file Peter Kjellerstedt (1): cppzmq: Move the version to the recipe file name Petr Gotthard (2): python3-pyroute2: upgrade 0.5.19 -> 0.7.9 networkmanager: upgrade 1.42.6 -> 1.42.8 Ricardo Salveti (1): lshw: bump to b4e0673 Ross Burton (5): poppler: fix missing include libpaper: remove redundant autoreconf --install liblbxutil: remove obsolete library xsetmode: remove obsolete utility libxkbui: remove obsolete recipe Tim Orling (1): python3-argh: upgrade 0.26.2 -> 0.28.1 Trevor Gamblin (9): python3-alembic: upgrade 1.10.4 -> 1.11.1 python3-sqlalchemy: upgrade 2.0.15 -> 2.0.19 python3-argcomplete: upgrade 3.1.0 -> 3.1.1 python3-arpeggio: upgrade 2.0.0 -> 2.0.2 python3-astroid: upgrade 2.15.5 -> 2.15.6 python3-autobahn: upgrade 23.6.1 -> 23.6.2 python3-bandit: upgrade 1.7.4 -> 1.7.5 python3-bandit: add python3-rich to RDEPENDS python3-bitarray: upgrade 2.7.3 -> 2.7.6 Wang Mingyu (44): cppzmq: upgrade 4.9.0 -> 4.10.0 iwd: upgrade 2.5 -> 2.6 libburn: upgrade 1.5.4 -> 1.5.6 libzip: upgrade 1.9.2 -> 1.10.0 openfortivpn: upgrade 1.20.3 -> 1.20.5 psqlodbc: upgrade 13.02.0000 -> 15.00.0000 python3-aenum: upgrade 3.1.12 -> 3.1.14 python3-can: upgrade 4.2.1 -> 4.2.2 python3-google-api-python-client: upgrade 2.89.0 -> 2.90.0 python3-h5py: upgrade 3.8.0 -> 3.9.0 python3-natsort: upgrade 8.3.1 -> 8.4.0 python3-pymodbus: upgrade 3.3.1 -> 3.3.2 python3-pymongo: upgrade 4.3.3 -> 4.4.0 python3-pyscaffold: upgrade 4.4.1 -> 4.5 python3-pyzstd: upgrade 0.15.7 -> 0.15.9 python3-requests-futures: upgrade 1.0.0 -> 1.0.1 python3-sentry-sdk: upgrade 1.25.1 -> 1.26.0 python3-zeroconf: upgrade 0.68.0 -> 0.69.0 weechat: upgrade 3.8 -> 4.0.0 python3-platformdirs: upgrade 3.6.0 -> 3.8.0 renderdoc: upgrade 1.13 -> 1.27 gegl: upgrade 0.4.44 -> 0.4.46 gvfs: upgrade 1.50.4 -> 1.51.1 weechat: upgrade 4.0.0 -> 4.0.1 avro-c: upgrade 1.11.1 -> 1.11.2 glfw: upgrade 3.3 -> 3.3.8 hwloc: upgrade 2.9.1 -> 2.9.2 minicoredumper: upgrade 2.0.3 -> 2.0.6 thingsboard-gateway: upgrade 3.2 -> 3.3 xterm: upgrade 382 -> 383 passwdqc: upgrade 2.0.2 -> 2.0.3 python3-aenum: upgrade 3.1.14 -> 3.1.15 python3-configargparse : upgrade 1.5.3 -> 1.5.5 python3-elementpath: upgrade 4.1.3 -> 4.1.4 python3-google-api-python-client: upgrade 2.90.0 -> 2.92.0 python3-google-auth: upgrade 2.20.0 -> 2.21.0 python3-joblib: upgrade 1.2.0 -> 1.3.1 python3-pillow: upgrade 9.5.0 -> 10.0.0 python3-redis: upgrade 4.5.5 -> 4.6.0 python3-tox: upgrade 4.6.0 -> 4.6.3 python3-virtualenv: upgrade 20.23.0 -> 20.23.1 python3-zeroconf: upgrade 0.69.0 -> 0.70.0 libyang: Fix install conflict when enable multilib. php: Fix install conflict when enable multilib. Wolfgang Meyer (4): fbida: Switch to git fetcher fbida: build with meson fbida: SRC_REV bump ac9005b..eb769e3 fbida: make fbpdf build optional Yi Zhao (6): conntrack-tools: add systemd unit file conntrack-tools: add required kernel modules to RRECOMMENDS frr: upgrade 8.4.2 -> 8.4.4 mbedtls: upgrade 2.28.2 -> 2.28.3 open-vm-tools: Security fix CVE-2023-20867 samba: upgrade 4.18.3 -> 4.18.4 Zoltán Böszörményi (1): opencv: 4.8.0 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I48c2ba4573ee81b637b1ba890c312f491004f666
Diffstat (limited to 'poky/meta/recipes-core/ovmf')
-rw-r--r--poky/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch8
-rw-r--r--poky/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch48
-rw-r--r--poky/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch (renamed from poky/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch)22
-rw-r--r--poky/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch (renamed from poky/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch)42
-rw-r--r--poky/meta/recipes-core/ovmf/ovmf_git.bb8
5 files changed, 63 insertions, 65 deletions
diff --git a/poky/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch b/poky/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
index 0c3df4fc44..490d9e8046 100644
--- a/poky/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
+++ b/poky/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
@@ -1,7 +1,7 @@
-From 1125f5a02c2f327aeffe2d6b66a9d816ad2eeec0 Mon Sep 17 00:00:00 2001
+From d8df6b6433351763e1db791dd84d432983d2b249 Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Date: Thu, 9 Jun 2016 02:23:01 -0700
-Subject: [PATCH 1/6] ovmf: update path to native BaseTools
+Subject: [PATCH 1/4] ovmf: update path to native BaseTools
BaseTools is a set of utilities to build EDK-based firmware. These utilities
are used during the build process. Thus, they need to be built natively.
@@ -16,7 +16,7 @@ Upstream-Status: Inappropriate [oe-core cross compile specific]
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
-index 91b1442ade..1858dae31a 100755
+index b0334fb76e..094f86f096 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -24,7 +24,7 @@ then
@@ -29,5 +29,5 @@ index 91b1442ade..1858dae31a 100755
source edksetup.sh BaseTools
else
--
-2.32.0
+2.30.2
diff --git a/poky/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/poky/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
index 2293d7e938..efabc8febc 100644
--- a/poky/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
+++ b/poky/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
@@ -1,7 +1,7 @@
-From 19d4c7f9812062a683b3ba60b35aac0461190456 Mon Sep 17 00:00:00 2001
+From 7675a67b8bb207de38ff5a9dc416e8b1028eb8ce Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Date: Fri, 26 Jul 2019 17:34:26 -0400
-Subject: [PATCH 2/6] BaseTools: makefile: adjust to build in under bitbake
+Subject: [PATCH 2/4] BaseTools: makefile: adjust to build in under bitbake
Prepend the build flags with those of bitbake. This is to build
using the bitbake native sysroot include and library directories.
@@ -14,58 +14,56 @@ to fight against how upstream wants to configure the build.
Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com>
Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups]
---
- BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
+ BaseTools/Source/C/Makefiles/header.makefile | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
-index 0df728f327..1299d47c87 100644
+index 1bf003523b..28757aed63 100644
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
-@@ -75,35 +75,36 @@ $(error Bad HOST_ARCH)
+@@ -82,35 +82,34 @@ $(error Bad HOST_ARCH)
endif
INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
--BUILD_CPPFLAGS = $(INCLUDE)
-+BUILD_CPPFLAGS += $(INCLUDE)
+-CPPFLAGS = $(INCLUDE)
++CPPFLAGS += $(INCLUDE)
# keep EXTRA_OPTFLAGS last
BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS)
ifeq ($(DARWIN),Darwin)
# assume clang or clang compatible flags on OS X
--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
-+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
+-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
++CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
-Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
else
- ifeq ($(CXX), llvm)
--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
-+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
+ ifneq ($(CLANG),)
+-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
++CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
-fno-delete-null-pointer-checks -Wall -Werror \
-Wno-deprecated-declarations -Wno-self-assign \
-Wno-unused-result -nostdlib -g
else
--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
-+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
+-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
++CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
-fno-delete-null-pointer-checks -Wall -Werror \
-Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \
-Wno-unused-result -nostdlib -g
endif
endif
- ifeq ($(CXX), llvm)
--BUILD_LFLAGS =
--BUILD_CXXFLAGS = -Wno-deprecated-register -Wno-unused-result
-+BUILD_LFLAGS = $(LDFLAGS)
-+BUILD_CXXFLAGS += -Wno-deprecated-register -Wno-unused-result
+ ifneq ($(CLANG),)
+-LDFLAGS =
+-CXXFLAGS = -Wno-deprecated-register -Wno-unused-result -std=c++14
++CXXFLAGS += -Wno-deprecated-register -Wno-unused-result -std=c++14
else
--BUILD_LFLAGS =
--BUILD_CXXFLAGS = -Wno-unused-result
-+BUILD_LFLAGS = $(LDFLAGS)
-+BUILD_CXXFLAGS += -Wno-unused-result
+-LDFLAGS =
+-CXXFLAGS = -Wno-unused-result
++CXXFLAGS += -Wno-unused-result
endif
+
ifeq ($(HOST_ARCH), IA32)
#
# Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults
--
-2.32.0
+2.30.2
diff --git a/poky/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch b/poky/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch
index 7adc45465c..c0c763c1cf 100644
--- a/poky/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch
+++ b/poky/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch
@@ -1,7 +1,7 @@
-From cf6361f27cd6318622fd58ab6c0a9407cc633b1e Mon Sep 17 00:00:00 2001
+From 03e536b20d0b72cf078052f6748de8df3836625c Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 14 Jun 2021 19:56:28 +0200
-Subject: [PATCH] debug prefix map
+Subject: [PATCH 3/4] debug prefix map
We want to pass ${DEBUG_PREFIX_MAP} to gcc commands and also pass in
--debug-prefix-map to nasm (we carry a patch to nasm for this). The
@@ -22,10 +22,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 471eb67c0c..a16fb5c9f1 100755
+index 503a6687c1..10ac38ef9e 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
-@@ -1849,7 +1849,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N
+@@ -739,7 +739,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_
*_*_*_DTCPP_PATH = DEF(DTCPP_BIN)
*_*_*_DTC_PATH = DEF(DTC_BIN)
@@ -34,7 +34,7 @@ index 471eb67c0c..a16fb5c9f1 100755
DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie
DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -fno-plt -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections
DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access
-@@ -1869,8 +1869,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere
+@@ -759,8 +759,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere
DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)
DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
@@ -45,7 +45,7 @@ index 471eb67c0c..a16fb5c9f1 100755
DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h
DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h
DEFINE GCC_ASLCC_FLAGS = -x c
-@@ -2022,7 +2022,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF(
+@@ -913,7 +913,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF(
*_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS)
*_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
*_GCC48_IA32_OBJCOPY_FLAGS =
@@ -54,7 +54,7 @@ index 471eb67c0c..a16fb5c9f1 100755
DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS)
RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable
-@@ -2050,7 +2050,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set
+@@ -941,7 +941,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set
*_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS)
*_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
*_GCC48_X64_OBJCOPY_FLAGS =
@@ -63,7 +63,7 @@ index 471eb67c0c..a16fb5c9f1 100755
DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS)
RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable
-@@ -2159,7 +2159,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
+@@ -1050,7 +1050,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
*_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS)
*_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
*_GCC49_IA32_OBJCOPY_FLAGS =
@@ -72,7 +72,7 @@ index 471eb67c0c..a16fb5c9f1 100755
DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS)
RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable
-@@ -2187,7 +2187,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set
+@@ -1078,7 +1078,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set
*_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS)
*_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
*_GCC49_X64_OBJCOPY_FLAGS =
@@ -81,7 +81,7 @@ index 471eb67c0c..a16fb5c9f1 100755
DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS)
RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable
-@@ -2302,7 +2302,7 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
+@@ -1337,7 +1337,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
*_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie
*_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
*_GCC5_IA32_OBJCOPY_FLAGS =
@@ -90,7 +90,7 @@ index 471eb67c0c..a16fb5c9f1 100755
DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto
DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386
-@@ -2334,7 +2334,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
+@@ -1369,7 +1369,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
*_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS)
*_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
*_GCC5_X64_OBJCOPY_FLAGS =
diff --git a/poky/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch b/poky/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch
index 846f408012..c3fdc3d863 100644
--- a/poky/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch
+++ b/poky/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch
@@ -1,7 +1,7 @@
-From 27ed9962f5cb3afcc44d6c96c53277132a999712 Mon Sep 17 00:00:00 2001
+From c59850367a190d70dec43e0a66f399a4d8a5ffed Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 14 Jun 2021 19:57:30 +0200
-Subject: [PATCH 6/6] reproducible
+Subject: [PATCH 4/4] reproducible
This patch fixes various things which make the build more reproducible. Some changes
here only change intermediate artefacts but that means when you have two build trees
@@ -35,10 +35,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
4 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
-index d097db8632..a87ae6f3d0 100644
+index 9c17c90b16..fcc7864141 100644
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
-@@ -14,6 +14,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
+@@ -15,6 +15,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#ifndef __GNUC__
#include <windows.h>
#include <io.h>
@@ -47,35 +47,35 @@ index d097db8632..a87ae6f3d0 100644
#endif
#include <assert.h>
#include <stdio.h>
-@@ -769,7 +771,7 @@ ScanSections64 (
+@@ -990,7 +992,7 @@ ScanSections64 (
}
mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) +
sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) +
- strlen(mInImageName) + 1;
+ strlen(basename(mInImageName)) + 1;
- mCoffOffset = CoffAlign(mCoffOffset);
- if (SectionCount == 0) {
-@@ -1608,7 +1610,7 @@ WriteDebug64 (
- EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *Dir;
- EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10;
+ //
+ // Add more space in the .debug data region for the DllCharacteristicsEx
+@@ -2261,7 +2263,7 @@ WriteDebug64 (
+ EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10;
+ EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry;
- Len = strlen(mInImageName) + 1;
+ Len = strlen(basename(mInImageName)) + 1;
- Dir = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY*)(mCoffFile + mDebugOffset);
- Dir->Type = EFI_IMAGE_DEBUG_TYPE_CODEVIEW;
-@@ -1618,7 +1620,7 @@ WriteDebug64 (
+ NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);
+ DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG];
+@@ -2294,7 +2296,7 @@ WriteDebug64 (
Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1);
Nb10->Signature = CODEVIEW_SIGNATURE_NB10;
- strcpy ((char *)(Nb10 + 1), mInImageName);
+ strcpy ((char *)(Nb10 + 1), basename(mInImageName));
+ }
-
- NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);
+ STATIC
diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Source/Python/AutoGen/BuildEngine.py
-index 722fead75a..8f1c236970 100644
+index 752a1a1f6a..02054cccf8 100644
--- a/BaseTools/Source/Python/AutoGen/BuildEngine.py
+++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py
@@ -70,6 +70,9 @@ class TargetDescBlock(object):
@@ -89,7 +89,7 @@ index 722fead75a..8f1c236970 100644
if Input not in self.Inputs:
self.Inputs.append(Input)
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
-index 961b2ab1c3..23c1592025 100755
+index daec9c6d54..0e8cc20efe 100755
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -575,7 +575,7 @@ cleanlib:
@@ -153,10 +153,10 @@ index 961b2ab1c3..23c1592025 100755
if T.GenFileListMacro and T.FileListMacro not in self.FileListMacros:
self.FileListMacros[T.FileListMacro] = []
diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
-index d70b0d7ae8..25dca9a6df 100755
+index d05410b329..99b3f64aba 100755
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
-@@ -1484,6 +1484,9 @@ class ModuleAutoGen(AutoGen):
+@@ -1474,6 +1474,9 @@ class ModuleAutoGen(AutoGen):
for File in Files:
if File.lower().endswith('.pdb'):
AsBuiltInfDict['binary_item'].append('DISPOSABLE|' + File)
@@ -166,7 +166,7 @@ index d70b0d7ae8..25dca9a6df 100755
HeaderComments = self.Module.HeaderComments
StartPos = 0
for Index in range(len(HeaderComments)):
-@@ -1759,7 +1762,7 @@ class ModuleAutoGen(AutoGen):
+@@ -1749,7 +1752,7 @@ class ModuleAutoGen(AutoGen):
if os.path.exists (self.TimeStampPath):
os.remove (self.TimeStampPath)
@@ -176,5 +176,5 @@ index d70b0d7ae8..25dca9a6df 100755
# Ignore generating makefile when it is a binary module
if self.IsBinaryModule:
--
-2.32.0
+2.30.2
diff --git a/poky/meta/recipes-core/ovmf/ovmf_git.bb b/poky/meta/recipes-core/ovmf/ovmf_git.bb
index bd92c5d43d..761c265453 100644
--- a/poky/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/poky/meta/recipes-core/ovmf/ovmf_git.bb
@@ -22,12 +22,12 @@ BUILD_CFLAGS += "-Wno-error=stringop-overflow"
SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
file://0001-ovmf-update-path-to-native-BaseTools.patch \
file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
- file://0005-debug-prefix-map.patch \
- file://0006-reproducible.patch \
+ file://0003-debug-prefix-map.patch \
+ file://0004-reproducible.patch \
"
-PV = "edk2-stable202302"
-SRCREV = "f80f052277c88a67c55e107b550f504eeea947d3"
+PV = "edk2-stable202305"
+SRCREV = "ba91d0292e593df8528b66f99c1b0b14fadc8e16"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
inherit deploy