Patch review
cover Patch review
Please review this set of changes for nanbield and have comments back by end of day Tuesday, January 30
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/6501
with the exception of a known autobuilder intermittent error on qemumips-tc:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=15036
Passed subsequent retest:
https://autobuilder.yoctoproject.org/typhoon/#/builders/148/builds/1231
The following changes since commit 3d5a85f173dffa14a6829edb9e6adbd5a3946d9c:
rpcbind: Specify state directory under /run (2024-01-23 04:27:34 -1000)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/nanbield-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/nanbield-nut
Bruce Ashfield (8):
linux-yocto/6.1: update to v6.1.69
linux-yocto/6.1: update to v6.1.70
linux-yocto/6.1: update CVE exclusions linux-yocto/6.1: update to v6.1.72
linux-yocto/6.1: update CVE exclusions linux-yocto/6.1: security/cfg: add configs to harden protection linux-yocto/6.1: update to v6.1.73
linux-yocto/6.1: update CVE exclusions
Clay Chang (1):
devtool: deploy: provide max_process to strip_execs
Joshua Watt (1):
classes-global/sstate: Fix variable typo
Markus Volk (1):
libadwaita: update 1.4.0 -> 1.4.2
Mingli Yu (1):
python3-license-expression: Fix the ptest failure
Peter Marko (1):
dtc: preserve version also from shallow git clones
Richard Purdie (3):
curl: Disable two intermittently failing tests lib/prservice: Improve lock handling robustness oeqa/selftest/prservice: Improve test robustness
Robert Berger (1):
uninative-tarball.xz - reproducibility fix
Robert Yang (1):
nfs-utils: Update Upstream-Status
Saul Wold (1):
package.py: OEHasPackage: Add MLPREFIX to packagename
Soumya Sambu (1):
ncurses: Fix - tty is hung after reset
Wang Mingyu (3):
libatomic-ops: upgrade 7.8.0 -> 7.8.2
libva-utils: upgrade 2.20.0 -> 2.20.1
kea: upgrade 2.4.0 -> 2.4.1
meta/classes-global/sstate.bbclass | 2 +-
meta/classes-recipe/populate_sdk_base.bbclass | 2 +-
meta/lib/oe/prservice.py | 4 +-
meta/lib/oeqa/runtime/decorator/package.py | 5 +-
meta/lib/oeqa/selftest/cases/prservice.py | 31 +-
.../kea/files/fix-multilib-conflict.patch | 8 +-
.../kea/files/fix_pid_keactrl.patch | 6 +-
.../kea/{kea_2.4.0.bb => kea_2.4.1.bb} | 2 +-
...nclude-unistd.h-to-compile-with-musl.patch | 2 +-
...eset-code-ncurses-6.4-patch-20231104.patch | 499 ++++++++++++++++++
meta/recipes-core/ncurses/ncurses_6.4.bb | 1 +
.../python3-license-expression/run-ptest | 2 +-
.../python3-license-expression_30.1.1.bb | 2 +
...ibadwaita_1.4.0.bb => libadwaita_1.4.2.bb} | 2 +-
...-utils_2.20.0.bb => libva-utils_2.20.1.bb} | 2 +-
...01-meson.build-bump-version-to-1.7.0.patch | 29 +
...n-allow-building-from-shallow-clones.patch | 38 ++
meta/recipes-kernel/dtc/dtc_1.7.0.bb | 6 +-
.../linux/cve-exclusion_6.1.inc | 68 ++-
.../linux/linux-yocto-rt_6.1.bb | 6 +-
.../linux/linux-yocto-tiny_6.1.bb | 6 +-
meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +-
meta/recipes-support/curl/curl/disable-tests | 6 +
...ic-ops_7.8.0.bb => libatomic-ops_7.8.2.bb} | 2 +-
scripts/lib/devtool/deploy.py | 3 +-
25 files changed, 706 insertions(+), 56 deletions(-)
rename meta/recipes-connectivity/kea/{kea_2.4.0.bb => kea_2.4.1.bb} (97%)
create mode 100644 meta/recipes-core/ncurses/files/0001-Updating-reset-code-ncurses-6.4-patch-20231104.patch
rename meta/recipes-gnome/libadwaita/{libadwaita_1.4.0.bb => libadwaita_1.4.2.bb} (88%)
rename meta/recipes-graphics/libva/{libva-utils_2.20.0.bb => libva-utils_2.20.1.bb} (95%)
create mode 100644 meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch
create mode 100644 meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
rename meta/recipes-support/libatomic-ops/{libatomic-ops_7.8.0.bb => libatomic-ops_7.8.2.bb} (89%)Signature · 1 line
2.34.1
PATCH 1/23 libatomic-ops: upgrade 7.8.0 -> 7.8.2
From: Wang Mingyu <[email protected]>
Changelog:
=========
* Eliminate 'atomic_thread_fence is unsupported with tsan' gcc-11 warning
* Eliminate 'comparing signed/unsigned values' lcc warning in add_chunk_as
* Fix 'undefined reference to AO_pt_lock' if configure is using clang-16
* Fix 'undefined reference to __atomic_load/store/cas_16' Mingw64-gcc error
* Fix 'undefined reference' linker errors if shared build on OpenBSD (CMake)
* Fix get_chunk for case of mmap area is located before AO_initial_heap
* Fix typo in AO_HAVE_compare_and_swap_double name in atomic_ops_stack.h
* Fix typo in comment of run_one_test of test_stack
* Fix typos in comments of atomic_ops_malloc.c and atomic_ops_stack.c/h
* Update cmake minimum required version to 3.5
---
.../{libatomic-ops_7.8.0.bb => libatomic-ops_7.8.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/libatomic-ops/{libatomic-ops_7.8.0.bb => libatomic-ops_7.8.2.bb} (89%)meta/recipes-support/libatomic-ops/libatomic-ops_7.8.2.bb renamed from meta/recipes-support/libatomic-ops/libatomic-ops_7.8.0.bb +1 -1
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libatomic_ops-${PV}.tar.gz" GITHUB_BASE_URI = "https://github.com/ivmai/libatomic_ops/releases" -SRC_URI[sha256sum] = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31" +SRC_URI[sha256sum] = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51" S = "${WORKDIR}/libatomic_ops-${PV}"
Signature · 1 line
2.34.1
PATCH 2/23 libva-utils: upgrade 2.20.0 -> 2.20.1
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
Changelog:
============
-Fix some coverity issues exposed in encode
-Fixed VPP coverity issues
---
.../libva/{libva-utils_2.20.0.bb => libva-utils_2.20.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/libva/{libva-utils_2.20.0.bb => libva-utils_2.20.1.bb} (95%)meta/recipes-graphics/libva/libva-utils_2.20.1.bb renamed from meta/recipes-graphics/libva/libva-utils_2.20.0.bb +1 -1
@@ -15,7 +15,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.20-branch;protocol=https" -SRCREV = "0c8373e62af3e4d9a3831334c5402ad255797e67" +SRCREV = "2ad888bb463dc9bfb3deb512ec9faf78f1d3bfa8" S = "${WORKDIR}/git" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))$"
Signature · 1 line
2.34.1
PATCH 3/23 libadwaita: update 1.4.0 -> 1.4.2
In reply to Steve SakomanFrom: Markus Volk <[email protected]>
=============
Version 1.4.2
=============
- Really fix build with libappstream 1.0
=============
Version 1.4.1
=============
- Fix build with MSVC
- Fix build with libappstream 1.0
- AdwCarousel
- Fix carousel scroll behavior with page reordering
- AdwComboRow
- Fix focus when opening the popover
- Set the correct state on the selected checkmark
- AdwNavigationView
- Fix a warning message
- AdwTabOverview
- Allow child focus on out animations
- AdwTabView
- Keep view alive during ::page-detached
- Fix crashes when using :pages
- Docs
- Fix erroneous <child> use in breakpoints migration guide
- Translation updates
- Russian
- Serbian
---
.../libadwaita/{libadwaita_1.4.0.bb => libadwaita_1.4.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-gnome/libadwaita/{libadwaita_1.4.0.bb => libadwaita_1.4.2.bb} (88%)meta/recipes-gnome/libadwaita/libadwaita_1.4.2.bb renamed from meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb +1 -1
@@ -12,7 +12,7 @@ DEPENDS = " \ inherit gnomebase gobject-introspection gi-docgen vala features_check -SRC_URI[archive.sha256sum] = "e51a098a54d43568218fc48fcf52e80e36f469b3ce912d8ce9c308a37e9f47c2" +SRC_URI[archive.sha256sum] = "33fa16754e7370c841767298b3ff5f23003ee1d2515cc2ff255e65ef3d4e8713" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl"
Signature · 1 line
2.34.1
PATCH 4/23 kea: upgrade 2.4.0 -> 2.4.1
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
Changelog:
=========
-The library version numbers have been bumped up for the Kea 2.4.1 stable release. -Fixed interface redetection which had stopped working since Kea 2.3.6. -Fixed a race condition in free lease queue allocator
fix-multilib-conflict.patch
fix_pid_keactrl.patch
refreshed for 2.4.
---
.../kea/files/fix-multilib-conflict.patch | 8 ++++----
meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch | 6 +++---
.../kea/{kea_2.4.0.bb => kea_2.4.1.bb} | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
rename meta/recipes-connectivity/kea/{kea_2.4.0.bb => kea_2.4.1.bb} (97%)meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +4 -4
@@ -1,4 +1,4 @@ -From d027b1d85a8c1a0193b6e4a00083d3038d699a59 Mon Sep 17 00:00:00 2001 +From 06ebd1b2ced426c420ed162980eca194f9f918ae Mon Sep 17 00:00:00 2001 From: Kai Kang <[email protected]> Date: Tue, 22 Sep 2020 15:02:33 +0800 Subject: [PATCH] There are conflict of config files between kea and lib32-kea:
@@ -35,10 +35,10 @@ index e6ae8b8..50a3092 100644 // "param1": "foo" // } diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre -index 26bf163..49ddb0a 100644 +index 6edb8a1..b2a7385 100644 --- a/src/bin/keactrl/kea-dhcp4.conf.pre +++ b/src/bin/keactrl/kea-dhcp4.conf.pre -@@ -252,7 +252,7 @@ +@@ -255,7 +255,7 @@ // // of all devices serviced by Kea, including their identifiers // // (like MAC address), their location in the network, times // // when they were active etc.
@@ -47,7 +47,7 @@ index 26bf163..49ddb0a 100644 // "parameters": { // "path": "/var/lib/kea", // "base-name": "kea-forensic4" -@@ -269,7 +269,7 @@ +@@ -272,7 +272,7 @@ // // of specific options or perhaps even a combination of several // // options and fields to uniquely identify a client. Those scenarios // // are addressed by the Flexible Identifiers hook application.
meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch +3 -3
@@ -1,4 +1,4 @@ -From 18f4f6206c248d6169aa67b3ecf16bf54e9292e8 Mon Sep 17 00:00:00 2001 +From c878a356712606549f7f188b62f7d1cae08a176e Mon Sep 17 00:00:00 2001 From: Armin kuster <[email protected]> Date: Wed, 14 Oct 2020 22:48:31 -0700 Subject: [PATCH] Busybox does not support ps -p so use pgrep
@@ -13,10 +13,10 @@ Signed-off-by: Armin kuster <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in -index ae5bd8e..e9f9b73 100644 +index 450e997..c353ca9 100644 --- a/src/bin/keactrl/keactrl.in +++ b/src/bin/keactrl/keactrl.in -@@ -151,8 +151,8 @@ check_running() { +@@ -149,8 +149,8 @@ check_running() { # Get the PID from the PID file (if it exists) get_pid_from_file "${proc_name}" if [ ${_pid} -gt 0 ]; then
meta/recipes-connectivity/kea/kea_2.4.1.bb renamed from meta/recipes-connectivity/kea/kea_2.4.0.bb +1 -1
@@ -19,7 +19,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ file://0001-kea-fix-reproducible-build-failure.patch \ " -SRC_URI[sha256sum] = "3a33cd08dc3319ff544e6bbf2c0429042106f4051ebe115dc1bb2625c95003f7" +SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a" inherit autotools systemd update-rc.d upstream-version-is-even
Signature · 1 line
2.34.1
PATCH 5/23 linux-yocto/6.1: update to v6.1.69
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating to the latest korg -stable release that comprises the following commits:
4aa6747d9352 Linux 6.1.69
325556d46bfd r8152: fix the autosuspend doesn't work
4c2ad8e39c62 r8152: remove rtl_vendor_mode function
1d82735f4bae r8152: avoid to change cfg for all devices
9b3d3a7f3c4d net: tls, update curr on splice as well
869aee35cf61 ring-buffer: Have rb_time_cmpxchg() set the msb counter too c425a772fc58 ring-buffer: Do not try to put back write_stamp
b15cf1486999 ring-buffer: Fix a race in rb_time_cmpxchg() for 32 bit archs edbc03d671f7 ring-buffer: Fix writing to the buffer with max_data_size 6d98d594a5b6 ring-buffer: Have saved event hold the entire event 7888b607a981 ring-buffer: Do not update before stamp when switching sub-buffers 7043c4610ca7 tracing: Update snapshot buffer on resize if it is allocated 31785cf8171e ring-buffer: Fix memory leak of free page
8c3b77ad4e91 smb: client: fix OOB in smb2_query_reparse_point()
d8541c50c671 smb: client: fix NULL deref in asn1_ber_decoder()
9f528a8e6832 smb: client: fix OOB in receive_encrypted_standard() 7b0faa541f15 drm/i915: Fix remapped stride with CCS on ADL+
20907717918f drm/amd/display: Disable PSR-SU on Parade 0803 TCON again a9e2de19433f drm/amdgpu: fix tear down order in amdgpu_vm_pt_free 730b3322b8c3 btrfs: don't clear qgroup reserved bit in release_folio 9b670e1b644c btrfs: free qgroup reserve when ORDERED_IOERR is set da9b7c651c65 mm/shmem: fix race in shmem_undo_range w/THP
8ec07b0620ac mm/mglru: fix underprotected page cache
40f3ad769ec8 dmaengine: stm32-dma: avoid bitfield overflow assertion 78b2ba39beef drm/amdgpu/sdma5.2: add begin/end_use ring callbacks 6a1472d9be02 team: Fix use-after-free when an option instance allocation fails b01af9281851 arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify 0b071a3266a8 ext4: prevent the normalized size from exceeding EXT_MAX_BLOCKS f2955dd3e933 soundwire: stream: fix NULL pointer dereference for multi_link 56f762659a5e btrfs: do not allow non subvolume root targets for snapshot 557f7ad06460 perf: Fix perf_event_validate_size() lockdep splat
a684235d3035 HID: hid-asus: add const to read-only outgoing usb buffer 2b9e16bc1ce5 arm64: add dependency between vmlinuz.efi and Image 6cb0c71c6e7c net: usb: qmi_wwan: claim interface 4 for ZTE MF290 f7ce765744a3 asm-generic: qspinlock: fix queued_spin_value_unlocked() implementation fba6e958caa1 HID: multitouch: Add quirk for HONOR GLO-GXXX touchpad 8f0c8585856c HID: hid-asus: reset the backlight brightness level on resume de78e4bdcb5e nbd: pass nbd_sock to nbd_read_reply() instead of index d482bb566344 HID: add ALWAYS_POLL quirk for Apple kb
541b183be92f HID: glorious: fix Glorious Model I HID report
42b4ab97bee5 platform/x86: intel_telemetry: Fix kernel doc descriptions 355170a7ecac LoongArch: Implement constant timer shutdown interface adb6a907540c LoongArch: Add dependency between vmlinuz.efi and vmlinux.efi 943cde1f3daa selftests/bpf: fix bpf_loop_bench for new callback verification scheme 1b40f23e702e nvme: catch errors from nvme_configure_metadata()
6cb3741c4582 nvme-auth: set explanation code for failure2 msgs
83bb13bf6c23 nbd: fold nbd config initialization into nbd_alloc_config() 02a4b14d17ab bcache: avoid NULL checking to c->root in run_cache_set() 3d3f72efc77d bcache: add code comments for bch_btree_node_get() and __bch_btree_node_alloc() bc17ec4215e2 bcache: remove redundant assignment to variable cur_idx be0e2a28e06a bcache: avoid oversize memory allocation by small stripe_size 94070fd6689e blk-cgroup: bypass blkcg_deactivate_policy after destroying e52d0eb48efd blk-throttle: fix lockdep warning of "cgroup_mutex or RCU read lock required!" 5fb6772cb573 stmmac: dwmac-loongson: Add architecture dependency 82c386d73689 usb: aqc111: check packet for fixup for true limit
d6c02295c824 x86/hyperv: Fix the detection of E820_TYPE_PRAM in a Gen2 VM ae818b2a2e78 drm/mediatek: Add spinlock for setting vblank event in atomic_begin 73c240e1ec73 ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE 0c196180b588 PCI: loongson: Limit MRRS to 256
56d1891594d6 Revert "PCI: acpiphp: Reassign resources on bridge if necessary" 1ec80b9d4310 ALSA: hda/realtek: Apply mute LED quirk for HP15-db eeeb91216a1b ALSA: hda/hdmi: add force-connect quirks for ASUSTeK Z170 variants 82413e9e4255 ALSA: hda/hdmi: add force-connect quirk for NUC5CPYB 0dc6a06c4843 fuse: dax: set fc->dax to NULL in fuse_dax_conn_free() 36e2497ac7ad cred: switch to using atomic_long_t
a51f71cd4f56 net: atlantic: fix double free in ring reinit logic 1646b2929d5e appletalk: Fix Use-After-Free in atalk_ioctl
d835299dde3e net: stmmac: Handle disabled MDIO busses from devicetree 9aac81639e52 dpaa2-switch: do not ask for MDB, VLAN and FDB replay a81c7069af05 dpaa2-switch: fix size of the dma_unmap
9a23be1e5806 vsock/virtio: Fix unsigned integer wrap around in virtio_transport_has_space() 2027dd67c3cf sign-file: Fix incorrect return values check
918991db7de0 stmmac: dwmac-loongson: Make sure MDIO is initialized before use 63387fe87fc5 net: ena: Fix XDP redirection error
2664b56420b3 net: ena: Fix xdp drops handling due to multibuf packets e312eed27aba net: ena: Destroy correct number of xdp queues upon failure 55a43bae0886 net: Remove acked SYN flag from packet in the transmit queue correctly 9bb392ee53af qed: Fix a potential use-after-free in qed_cxt_tables_alloc 112792ad36c4 iavf: Handle ntuple on/off based on new state machines for flow director 11c314a5a44a iavf: Introduce new state machines for flow director 01540ee2366a net/rose: Fix Use-After-Free in rose_ioctl
2de2a6cbe14f atm: Fix Use-After-Free in do_vcc_ioctl
3a76dcab2e3a octeontx2-af: Update RSS algorithm index
d0f0786f8c5a octeontx2-pf: Fix promisc mcam entry action
34b630626a97 octeontx2-af: fix a use-after-free in rvu_nix_register_reporters e4ce3dc7a0ed net: fec: correct queue selection
a00dbc6dec4b net: vlan: introduce skb_vlan_eth_hdr()
7cfbb8bea36a atm: solos-pci: Fix potential deadlock on &tx_queue_lock 35c63d366fff atm: solos-pci: Fix potential deadlock on &cli_queue_lock 525904a15791 bnxt_en: Fix HWTSTAMP_FILTER_ALL packet timestamp logic ac6125174190 bnxt_en: Fix wrong return value check in bnxt_close_nic() 8217f9362c79 bnxt_en: Save ring error counters across reset
53cacb8cdc7e bnxt_en: Clear resource reservation during resume
ab410db6e9aa qca_spi: Fix reset behavior
7e177e5a40d0 qca_debug: Fix ethtool -G iface tx behavior
2127142c179c qca_debug: Prevent crash on TX ring changes
0da41ddfb291 net: ipv6: support reporting otherwise unknown prefix flags in RTM_NEWPREFIX 514232495aa5 net/mlx5e: Fix possible deadlock on mlx5e_tx_timeout_work 1e8396aab21d HID: lenovo: Restrict detection of patched firmware only to USB cptkbd e0cda159c865 afs: Fix refcount underflow from error handling race a7e6477cc3af ksmbd: fix memory leak in smb2_lock()
8925ab33b391 ext4: fix warning in ext4_dio_write_end_io()
1c077acf246c powerpc/ftrace: Fix stack teardown in ftrace_no_trace 34ae53cccf53 r8152: add vendor/device ID pair for ASUS USB-C2500 cac1218b32d7 r8152: add vendor/device ID pair for D-Link DUB-E250 893597cbabfb r8152: add USB device driver for config selection
b80d0c6e5bae perf/x86/uncore: Don't WARN_ON_ONCE() for a broken discovery table
--- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +3 -3
@@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "739b3001f20153a66d2723de81faae18cd61892b" -SRCREV_meta ?= "991713c8765172cb5d18703d15589f3ec6e1b772" +SRCREV_machine ?= "98f81d89530aff38b127115065e71773e4e771ec" +SRCREV_meta ?= "50f164ae552b44c7b4c02394a795b997a13c366b" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.68" +LINUX_VERSION ?= "6.1.69" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +3 -3
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.68" +LINUX_VERSION ?= "6.1.69" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" -SRCREV_meta ?= "991713c8765172cb5d18703d15589f3ec6e1b772" +SRCREV_machine ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" +SRCREV_meta ?= "50f164ae552b44c7b4c02394a795b997a13c366b" PV = "${LINUX_VERSION}+git"
meta/recipes-kernel/linux/linux-yocto_6.1.bb +14 -14
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "85915187700314cb7ac70fd33da3e9dfd7c20063" -SRCREV_machine:qemuarm64 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" -SRCREV_machine:qemuloongarch64 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" -SRCREV_machine:qemumips ?= "24b06ee00fc3b65a24d7e867148b08a85296e67c" -SRCREV_machine:qemuppc ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" -SRCREV_machine:qemuriscv64 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" -SRCREV_machine:qemuriscv32 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" -SRCREV_machine:qemux86 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" -SRCREV_machine:qemux86-64 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" -SRCREV_machine:qemumips64 ?= "d4659a339611a02e4ffc2861e697c1a278707d70" -SRCREV_machine ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" -SRCREV_meta ?= "991713c8765172cb5d18703d15589f3ec6e1b772" +SRCREV_machine:qemuarm ?= "0a00ee457af7e769ac4c813d5a5c2edbe227ca56" +SRCREV_machine:qemuarm64 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" +SRCREV_machine:qemuloongarch64 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" +SRCREV_machine:qemumips ?= "b0c5bfb120afb832e5bd9d9df2b5a15173e4c930" +SRCREV_machine:qemuppc ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" +SRCREV_machine:qemuriscv64 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" +SRCREV_machine:qemuriscv32 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" +SRCREV_machine:qemux86 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" +SRCREV_machine:qemux86-64 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" +SRCREV_machine:qemumips64 ?= "c30b2a4361fb2c7dc3dbfebc46b9ee8a59ae7c78" +SRCREV_machine ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" +SRCREV_meta ?= "50f164ae552b44c7b4c02394a795b997a13c366b" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "ba6f5fb465114fcd48ddb2c7a7740915b2289d6b" +SRCREV_machine:class-devupstream ?= "4aa6747d935281df8a1888feeb6e22e0097d0b86" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base"
@@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.68" +LINUX_VERSION ?= "6.1.69" PV = "${LINUX_VERSION}+git"
Signature · 1 line
2.34.1
PATCH 6/23 linux-yocto/6.1: update to v6.1.70
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating linux-yocto/6.1 to the latest korg -stable release that comprises the following commits:
a507f147e6f0 Linux 6.1.70
a413b88cdb69 loop: deprecate autoloading callback loop_probe()
75c27bdb2144 wifi: nl80211: fix deadlock in nl80211_set_cqm_rssi (6.6.x)
15577a98ef29 wifi: cfg80211: fix CQM for non-range use
706448f716c1 fuse: share lookup state between submount and its parent
ec7b81b0abcd mm/damon/core: make damon_start() waits until kdamond_fn() starts 41f4ff9fe22c x86/alternatives: Sync core before enabling interrupts
425379154b7f KVM: arm64: vgic: Force vcpu vgic teardown on vcpu destroy
5dfacfd0fcd6 KVM: arm64: vgic: Add a non-locking primitive for kvm_vgic_vcpu_destroy() 3a0fd93cd9f7 KVM: arm64: vgic: Simplify kvm_vgic_destroy()
3339028dd082 thunderbolt: Fix memory leak in margining_port_remove()
69b6596c6e4a lib/vsprintf: Fix %pfwf when current node refcount == 0
2dd6f2286047 gpio: dwapb: mask/unmask IRQ when disable/enale it
ab1c3f91d174 bus: ti-sysc: Flush posted write only after srst_udelay
cd9f9ef59d85 pinctrl: starfive: jh7100: ignore disabled device tree nodes
7f7efa30fa87 dm-integrity: don't modify bio's immutable bio_vec in integrity_metadata() 33b976a0f2ae tracing / synthetic: Disable events after testing in synth_event_gen_test_init() d2b549d3107b scsi: core: Always send batch on reset or error handling command 72e472a91c0d Revert "scsi: aacraid: Reply queue mapping to CPUs based on IRQ affinity" 4258274bacfb selftests: mptcp: join: fix subflow_send_ack lookup
a8555c86f508 ublk: move ublk_cancel_dev() out of ub->mutex
1c250f2c5fa5 ubifs: fix possible dereference after free
3c42cc437d7e btrfs: zoned: no longer count fresh BG region as zone unusable b09a67617621 Revert "drm/amd/display: Do not set DRR on pipe commit"
93da3d8af9ee dm thin metadata: Fix ABBA deadlock by resetting dm_bufio_client e9779fac685e loop: do not enforce max_loop hard limit by (new) default
600043e1856c RISC-V: Fix do_notify_resume / do_work_pending prototype
764c6790dd71 9p: prevent read overrun in protocol dump tracepoint
7d09c84df5ab drm/i915: Reject async flips with bigjoiner
c60e10d1549f smb: client: fix OOB in smbCalcSize()
bef4315f19ba smb: client: fix OOB in SMB2_query_info_init()
71fe685b6a47 smb: client: fix potential OOB in cifs_dump_detail()
277832a306f9 smb: client: fix OOB in cifsd when receiving compounded resps 3f6da210470c dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp
1092525155ea net: ks8851: Fix TX stall caused by TX buffer overrun
e9df9f089128 net: rfkill: gpio: set GPIO direction
805611157d68 net: 9p: avoid freeing uninit memory in p9pdu_vreadf
4c775b4cd8dd Input: soc_button_array - add mapping for airplane mode button 5df2b49e7e78 net: usb: ax88179_178a: avoid failed operations when device is disconnected 0f7bffd40a51 Bluetooth: Add more enc key size check
39347d645081 Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE e14a7ebafe4e Bluetooth: L2CAP: Send reject on command corrupted request
37f71e2c9f51 Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg 470896ecbc92 Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent d36d945f94c3 ALSA: hda/realtek: Add quirk for ASUS ROG GV302XA
9599a5e34ca9 USB: serial: option: add Quectel RM500Q R13 firmware support
a91fb450df5d USB: serial: option: add Foxconn T99W265 with new baseline
73b6b6ab03ae USB: serial: option: add Quectel EG912Y module support
9b968a708678 USB: serial: ftdi_sio: update Actisense PIDs constant names
db57ef0dd4c2 wifi: cfg80211: fix certs build to not depend on file order
ec350809cd98 wifi: cfg80211: Add my certificate
228d9960ae81 usb-storage: Add quirk for incorrect WP on Kingston DT Ultimate 3.0 G3 82f913724bc9 ALSA: usb-audio: Increase delay in MOTU M quirk
01bc94b58192 iio: triggered-buffer: prevent possible freeing of wrong buffer c508a99fbc21 iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma() 1b670b0eeefa iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table 1fe4c93fc77b scsi: bnx2fc: Fix skb double free in bnx2fc_rcv()
66ccf5f7437a Input: ipaq-micro-keys - add error handling for devm_kmemdup
3637f6bdfe2c interconnect: qcom: sm8250: Enable sync_state
90aa62722d3e iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw 50d60bfc9681 interconnect: Treat xlate() returning NULL node as an error
900c1b3c62f9 drm/i915: Fix ADL+ tiled plane stride when the POT stride is smaller than the original de4349bdf9f3 drm/i915/mtl: Add MTL for remapping CCS FBs
52c1a67dd303 drm/i915/dpt: Only do the POT stride remap when using DPT
7afe8109456d drm/i915: Fix intel_atomic_setup_scalers() plane_state handling b097184f8026 drm/i915: Relocate intel_atomic_setup_scalers()
99767368b7fa drm/i915/mtl: limit second scaler vertical scaling in ver >= 14 387e8077593e nvme-pci: fix sleeping function called from interrupt context b506833ee887 gpiolib: cdev: add gpio_device locking wrapper around gpio_ioctl() 6eb51df9e739 pinctrl: at91-pio4: use dedicated lock class for IRQ
903bb0c7b81f x86/xen: add CPU dependencies for 32-bit build
2550d96aa248 i2c: aspeed: Handle the coalesced stop conditions with the start conditions. 5c11f637999c ASoC: fsl_sai: Fix channel swap issue on i.MX8MP
264d8c9b7f7f ASoC: hdmi-codec: fix missing report for jack initial status
9b4c95a63e2d afs: Fix use-after-free due to get/remove race in volume tree 17605162e26b afs: Fix overwriting of result of DNS query
791d5409cdb9 keys, dns: Allow key types (eg. DNS) to be reclaimed immediately on expiry 3e617c7e39eb net: check dev->gso_max_size in gso_features_check()
087b96adc694 afs: Fix dynamic root lookup DNS check
9c6ea7abe3ed afs: Fix the dynamic root's d_delete to always delete unused dentries a70c2dd74198 net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev() ea03196ebc47 net: mana: select PAGE_POOL
a1986c429c68 Bluetooth: hci_event: shut up a false-positive warning
fc6471510582 Bluetooth: Fix deadlock in vhci_send_frame
3e0d1585799d net/rose: fix races in rose_kill_by_device()
51e28c37d960 ethernet: atheros: fix a memleak in atl1e_setup_ring_resources 6707baabe432 net: sched: ife: fix potential use-after-free
31edab12229c net: Return error from sk_stream_wait_connect() if sk_wait_event() fails 9d00421e1430 octeontx2-pf: Fix graceful exit during PFC configuration failure b0cee294022f net: mscc: ocelot: fix eMAC TX RMON stats for bucket 256-511 and above 72b8de75b394 net/mlx5e: Correct snprintf truncation handling for fw_version buffer used by representors 18b4a5e0c3f5 net/mlx5e: Correct snprintf truncation handling for fw_version buffer 94c8485b449e net/mlx5: Fix fw tracer first block check
1750f55d855a net/mlx5e: fix a potential double-free in fs_udp_create_groups 01877daaeff0 net/mlx5e: Fix a race in command alloc flow
f3739647a737 net/mlx5: Re-organize mlx5_cmd struct
148ec770c63e net/mlx5: Prevent high-rate FW commands from populating all slots bd6e09162910 net/mlx5: Introduce and use opcode getter in command interface 0f5de95fa266 net/mlx5e: Fix slab-out-of-bounds in mlx5_query_nic_vport_mac_list() 31037cfceff8 Revert "net/mlx5e: fix double free of encap_header"
8a84413505a6 Revert "net/mlx5e: fix double free of encap_header in update funcs" 2f635af7d6b4 wifi: mac80211: mesh_plink: fix matches_local logic
7a07af00aa88 wifi: mac80211: mesh: check element parsing succeeded
40ba7f9ab82a wifi: mac80211: check if the existing link config remains unchanged e90da1c7c6e7 wifi: iwlwifi: pcie: add another missing bh-disable for rxq->lock 912652366f9e s390/vx: fix save/restore of fpu kernel context
0a6e700c3d7b reset: Fix crash when freeing non-existent optional resets
930a61fd795d ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init 228a00a77d50 ARM: dts: dra7: Fix DRA7 L3 NoC node register size
913463f8e6cd drm/amd/display: fix hw rotated modes when PSR-SU is enabled
a4f48f77bbe7 HID: i2c-hid: Add IDEA5002 to i2c_hid_acpi_blacklist[]
413bef367ba6 HID: i2c-hid: acpi: Unify ACPI ID tables format
57a6b0a464eb bpf: Fix prog_array_map_poke_run map poke update
4768f82272a7 kasan: disable kasan_non_canonical_hook() for HW tags
--- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +3 -3
@@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "98f81d89530aff38b127115065e71773e4e771ec" -SRCREV_meta ?= "50f164ae552b44c7b4c02394a795b997a13c366b" +SRCREV_machine ?= "c7164e4299dfbd93c9ec4f9bd307ebbb88aa6b71" +SRCREV_meta ?= "4fe5dc52631f3b990aefbb3f97330137c4ebb288" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.69" +LINUX_VERSION ?= "6.1.70" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +3 -3
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.69" +LINUX_VERSION ?= "6.1.70" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" -SRCREV_meta ?= "50f164ae552b44c7b4c02394a795b997a13c366b" +SRCREV_machine ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" +SRCREV_meta ?= "4fe5dc52631f3b990aefbb3f97330137c4ebb288" PV = "${LINUX_VERSION}+git"
meta/recipes-kernel/linux/linux-yocto_6.1.bb +14 -14
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "0a00ee457af7e769ac4c813d5a5c2edbe227ca56" -SRCREV_machine:qemuarm64 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" -SRCREV_machine:qemuloongarch64 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" -SRCREV_machine:qemumips ?= "b0c5bfb120afb832e5bd9d9df2b5a15173e4c930" -SRCREV_machine:qemuppc ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" -SRCREV_machine:qemuriscv64 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" -SRCREV_machine:qemuriscv32 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" -SRCREV_machine:qemux86 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" -SRCREV_machine:qemux86-64 ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" -SRCREV_machine:qemumips64 ?= "c30b2a4361fb2c7dc3dbfebc46b9ee8a59ae7c78" -SRCREV_machine ?= "175de8d5cbb8d4003e13ad29ab2e0ae29b585c90" -SRCREV_meta ?= "50f164ae552b44c7b4c02394a795b997a13c366b" +SRCREV_machine:qemuarm ?= "b763843c7f0f71c1488daf5d7453656360bfd217" +SRCREV_machine:qemuarm64 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" +SRCREV_machine:qemuloongarch64 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" +SRCREV_machine:qemumips ?= "f72c516f5594f4eef9c26d380abf60768695c7da" +SRCREV_machine:qemuppc ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" +SRCREV_machine:qemuriscv64 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" +SRCREV_machine:qemuriscv32 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" +SRCREV_machine:qemux86 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" +SRCREV_machine:qemux86-64 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" +SRCREV_machine:qemumips64 ?= "951e24cce7143380de09baa2d1d59062a969d021" +SRCREV_machine ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" +SRCREV_meta ?= "4fe5dc52631f3b990aefbb3f97330137c4ebb288" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "4aa6747d935281df8a1888feeb6e22e0097d0b86" +SRCREV_machine:class-devupstream ?= "a507f147e6f06e86b7649b46bc1d3caa34b196d6" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base"
@@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.69" +LINUX_VERSION ?= "6.1.70" PV = "${LINUX_VERSION}+git"
Signature · 1 line
2.34.1
PATCH 7/23 linux-yocto/6.1: update CVE exclusions
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Data pulled from: https://github.com/nluedtke/linux_kernel_cves
1/1 [
Author: Nicholas Luedtke
Email: [email protected]
Subject: Update 27Dec23
Date: Wed, 27 Dec 2023 19:47:13 -0500
]--- .../linux/cve-exclusion_6.1.inc | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-)
meta/recipes-kernel/linux/cve-exclusion_6.1.inc +40 -4
@@ -1,9 +1,9 @@ # Auto-generated CVE metadata, DO NOT EDIT BY HAND. -# Generated at 2023-12-23 08:44:42.304531+00:00 for version 6.1.68 +# Generated at 2024-01-03 21:24:21.156991+00:00 for version 6.1.70 python check_kernel_cve_status_version() { - this_version = "6.1.68" + this_version = "6.1.70" kernel_version = d.getVar("LINUX_VERSION") if kernel_version != this_version: bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version))
@@ -5106,11 +5106,21 @@ CVE_STATUS[CVE-2023-4881] = "cpe-stable-backport: Backported in 6.1.54" CVE_STATUS[CVE-2023-4921] = "cpe-stable-backport: Backported in 6.1.54" +# CVE-2023-50431 has no known resolution + CVE_STATUS[CVE-2023-5090] = "cpe-stable-backport: Backported in 6.1.62" CVE_STATUS[CVE-2023-5158] = "cpe-stable-backport: Backported in 6.1.57" -# CVE-2023-5178 needs backporting (fixed from 6.1.60) +# CVE-2023-51779 needs backporting (fixed from 6.7rc7) + +CVE_STATUS[CVE-2023-5178] = "cpe-stable-backport: Backported in 6.1.60" + +CVE_STATUS[CVE-2023-51780] = "cpe-stable-backport: Backported in 6.1.69" + +CVE_STATUS[CVE-2023-51781] = "cpe-stable-backport: Backported in 6.1.69" + +CVE_STATUS[CVE-2023-51782] = "cpe-stable-backport: Backported in 6.1.69" CVE_STATUS[CVE-2023-5197] = "cpe-stable-backport: Backported in 6.1.56"
@@ -5120,7 +5130,7 @@ CVE_STATUS[CVE-2023-5633] = "fixed-version: only affects 6.2 onwards" # CVE-2023-5717 needs backporting (fixed from 6.1.60) -# CVE-2023-5972 needs backporting (fixed from 6.6rc7) +CVE_STATUS[CVE-2023-5972] = "fixed-version: only affects 6.2rc1 onwards" # CVE-2023-6039 needs backporting (fixed from 6.5rc5)
@@ -5132,3 +5142,29 @@ CVE_STATUS[CVE-2023-6176] = "cpe-stable-backport: Backported in 6.1.54" # CVE-2023-6238 has no known resolution +# CVE-2023-6356 has no known resolution + +# CVE-2023-6535 has no known resolution + +# CVE-2023-6536 has no known resolution + +CVE_STATUS[CVE-2023-6546] = "cpe-stable-backport: Backported in 6.1.47" + +# CVE-2023-6560 needs backporting (fixed from 6.7rc4) + +# CVE-2023-6606 needs backporting (fixed from 6.7rc7) + +# CVE-2023-6610 needs backporting (fixed from 6.7rc7) + +CVE_STATUS[CVE-2023-6622] = "cpe-stable-backport: Backported in 6.1.68" + +# CVE-2023-6679 needs backporting (fixed from 6.7rc6) + +CVE_STATUS[CVE-2023-6817] = "cpe-stable-backport: Backported in 6.1.68" + +CVE_STATUS[CVE-2023-6931] = "cpe-stable-backport: Backported in 6.1.68" + +CVE_STATUS[CVE-2023-6932] = "cpe-stable-backport: Backported in 6.1.66" + +# CVE-2023-7042 has no known resolution +
Signature · 1 line
2.34.1
PATCH 8/23 linux-yocto/6.1: update to v6.1.72
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating linux-yocto/6.1 to the latest korg -stable release that comprises the following commits:
7c58bfa711cb Linux 6.1.72
2dbe25ae06e6 Revert "interconnect: qcom: sm8250: Enable sync_state"
f73a374c1969 smb3: Replace smb2pdu 1-element arrays with flex-arrays
ec162546a733 media: qcom: camss: Comment CSID dt_id field
a5c3f2b4cee7 bpf: syzkaller found null ptr deref in unix_bpf proto add
15db682980fc bpf: Fix a verifier bug due to incorrect branch offset comparison with cpu=v4 7cbdf36eabf3 net/sched: act_ct: Always fill offloading tuple iifidx
2be4e8ac2d16 net/sched: act_ct: additional checks for outdated flows
87318b7e374c f2fs: compress: fix to assign compress_level for lz4 correctly
397f719037c2 genirq/affinity: Only build SMP-only helper functions on SMP kernels
28c9222e29e5 mmc: sdhci-sprd: Fix eMMC init failure after hw reset
2813a434d461 mmc: core: Cancel delayed work before releasing host
575e127041f2 mmc: rpmb: fixes pause retune on all RPMB partitions.
9c5efaa09b31 mmc: meson-mx-sdhc: Fix initialization frozen issue
48e1d426f452 drm/amd/display: add nv12 bounding box
11c3510d1d4d drm/amdgpu: skip gpu_info fw loading on navi12
dafdeb7b91f1 mm: fix unmap_mapping_range high bits shift bug
08038069c237 i2c: core: Fix atomic xfer check for non-preempt config
53b42cb33fb1 x86/kprobes: fix incorrect return address calculation in kprobe_emulate_call_indirect d1db1ef5e633 firewire: ohci: suppress unexpected system reboot in AMD Ryzen machines and ASM108x/VT630x PCIe cards 09a44d994bfe ring-buffer: Fix 32-bit rb_time_read() race with rb_time_cmpxchg()
820a7802f25a btrfs: mark the len field in struct btrfs_ordered_sum as unsigned
ab220f4f5c70 btrfs: fix qgroup_free_reserved_data int overflow
0f74dde5be2c octeontx2-af: Support variable number of lmacs
7d3912613d5b octeontx2-af: Fix pause frame configuration
a29b15cc68a6 net/sched: act_ct: Take per-cb reference to tcf_ct_flow_table
2bb4ecb3349c netfilter: flowtable: GC pushes back packets to classic path
df01de08b411 net/sched: act_ct: Fix promotion of offloaded unreplied tuple
87466a374571 net/sched: act_ct: offload UDP NEW connections
8b160f2fba77 netfilter: flowtable: cache info of last offload
c29a7656f8a2 netfilter: flowtable: allow unidirectional rules
e681f711e9e8 net: sched: call tcf_ct_params_free to free params in tcf_ct_init
d49bf9c1ceb3 mm/memory_hotplug: fix error handling in add_memory_resource()
4666f003afff mm/memory_hotplug: add missing mem_hotplug_lock
a576780a2a66 lib/group_cpus.c: avoid acquiring cpu hotplug lock in group_cpus_evenly f33b27f5c3de genirq/affinity: Move group_cpus_evenly() into lib/
617ba3735d3b genirq/affinity: Rename irq_build_affinity_masks as group_cpus_evenly
aeeb4e4e49f8 genirq/affinity: Don't pass irq_affinity_desc array to irq_build_affinity_masks 9e84d7bb1505 genirq/affinity: Pass affinity managed mask array to irq_build_affinity_masks a1dcd1794730 genirq/affinity: Remove the 'firstvec' parameter from irq_build_affinity_masks f4fe76467e7b ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7
aee609302d65 firmware: arm_scmi: Fix frequency truncation by promoting multiplier type 90d1f74c3cf6 bpf, sockmap: af_unix stream sockets need to hold ref for pair sock
5ff1682fec18 ethtool: don't propagate EOPNOTSUPP from dumps
e570b1508753 dpaa2-eth: recycle the RX buffer only after all processing done
5b8938fc7d00 net: dpaa2-eth: rearrange variable in dpaa2_eth_get_ethtool_stats
e88275ce7e7b smb: client: fix missing mode bits for SMB symlinks
bf223fd4d914 block: update the stable_writes flag in bdev_add
a8e4300ae58d filemap: add a per-mapping stable writes flag
d0eafc763135 mm, netfs, fscache: stop read optimisation when folio removed from pagecache bceff380f361 mm: merge folio_has_private()/filemap_release_folio() call pairs
8b6b3ecf0c13 memory-failure: convert truncate_error_page() to use folio
a6f440f3b956 khugepage: replace try_to_release_page() with filemap_release_folio()
4c78612e5fbc ext4: convert move_extent_per_page() to use folios
b92a8f591ca8 media: qcom: camss: Fix set CSI2_RX_CFG1_VC_MODE when VC is greater than 3 710f70555d5b media: camss: sm8250: Virtual channels for CSID
c96a4f936008 selftests: mptcp: set FAILING_LINKS in run_tests
4b85e920afc8 selftests: mptcp: fix fastclose with csum failure
336d1ee07efb f2fs: set the default compress_level on ioctl
1ff3f5ef284b f2fs: assign default compression level
55d3f41e5583 f2fs: convert to use bitmap API
84a8d913fb53 f2fs: clean up i_compress_flag and i_compress_level usage
2c14f4991610 s390/cpumf: support user space events for counting
a1a1e5ce88a7 s390/mm: add missing arch_set_page_dat() call to vmem_crst_alloc()
31051f722db2 net/mlx5: Increase size of irq name buffer
b5c8e0ff76d1 blk-mq: make sure active queue usage is held for bio_integrity_prep()
803fb6109fcf bpf: fix precision backtracking instruction iteration
b08acd5c4602 bpf: handle ldimm64 properly in check_cfg()
2c795ce09042 bpf: Support new 32bit offset jmp instruction
b1c780ed3c22 bpf: clean up visit_insn()'s instruction processing
97bb6dab0172 bpf: Remove unused insn_cnt argument from visit_[func_call_]insn()
8266c47d04b2 bpf: remove unnecessary prune and jump points
743f3548d301 bpf: decouple prune and jump points
eb4f2e17886a fbdev: imsttfb: fix double free in probe()
f2a79f3651a5 fbdev: imsttfb: Release framebuffer and dealloc cmap on error path
51a1b943022f arm64: dts: qcom: sdm845: Fix PSCI power domain names
5db8b93cbe2d arm64: dts: qcom: sdm845: align RPMh regulator nodes with bindings
343bb27e3152 wifi: iwlwifi: yoyo: swap cdb and jacket bits values
158b71f3a9fa udp: annotate data-races around udp->encap_type
8d929b6c1114 udp: lockless UDP_ENCAP_L2TPINUDP / UDP_GRO
b680a907d17c udp: move udp->accept_udp_{l4|fraglist} to udp->udp_flags
753886c0b994 udp: move udp->gro_enabled to udp->udp_flags
a01cff15ccdc udp: move udp->no_check6_rx to udp->udp_flags
50e41aa9ea0d udp: move udp->no_check6_tx to udp->udp_flags
e2a4392b61f6 udp: introduce udp->udp_flags
2489502fb1f5 ipv4, ipv6: Use splice_eof() to flush
4713b7c7568b splice, net: Add a splice_eof op to file-ops and socket-ops
ac8c69e448f7 udp: Convert udp_sendpage() to use MSG_SPLICE_PAGES
6bcc79a4e760 net: Declare MSG_SPLICE_PAGES internal sendmsg() flag
89b51e70e5e3 bpf, x86: save/restore regs with BPF_DW size
4ee461c5dc99 bpf, x86: Simplify the parsing logic of structure parameters
605c8d8f9966 bpf, x64: Fix tailcall infinite loop
5573fdbc3423 srcu: Fix callbacks acceleration mishandling
abc3e3fb71a5 cpu/SMT: Make SMT control more robust against enumeration failures
482fa21635c8 cpu/SMT: Create topology_smt_thread_allowed()
a364c18553d0 selftests: secretmem: floor the memory size to the multiple of page_size c38c5cfd3ed7 net: Implement missing SO_TIMESTAMPING_NEW cmsg support
14937f47a48f bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()
55fbcd83aaca net: ravb: Wait for operating mode to be applied
8a09b0f01c40 asix: Add check for usbnet_get_endpoints
db9c4a1f37ee octeontx2-af: Re-enable MAC TX in otx2_stop processing
b67e7d78e48a octeontx2-af: Always configure NIX TX link credits based on max frame size 84c3833a93bb net/smc: fix invalid link access in dumping SMC-R connections
0af75845ff5e net/qla3xxx: fix potential memleak in ql_alloc_buffer_queues
9b0504292237 igc: Fix hicredit calculation
7663226274af i40e: Restore VF MSI-X state during PCI reset
5735f529e318 ASoC: meson: g12a-tohdmitx: Fix event generation for S/PDIF mux
8719838c126a ASoC: meson: g12a-toacodec: Fix event generation
5de3c8496e77 ASoC: meson: g12a-tohdmitx: Validate written enum values
95b4d4093ac0 ASoC: meson: g12a-toacodec: Validate written enum values
2f3b6e8600c9 i40e: fix use-after-free in i40e_aqc_add_filters()
72fa66177859 net: Save and restore msg_namelen in sock_sendmsg
81f8a995ebc8 netfilter: nft_immediate: drop chain reference counter on error
bb1bf97fa187 net: bcmgenet: Fix FCS generation for fragmented skbuffs
e75715e1c2e5 sfc: fix a double-free bug in efx_probe_filters
725d44e49fb5 ARM: sun9i: smp: Fix array-index-out-of-bounds read in sunxi_mc_smp_init 85f6fae44bba selftests: bonding: do not set port down when adding to bond
3edd66bd4e42 net: Implement missing getsockopt(SO_TIMESTAMPING_NEW)
ac5fde92b510 net: annotate data-races around sk->sk_bind_phc
c48fcb4f4906 net: annotate data-races around sk->sk_tsflags
5d586f7ca0fc net-timestamp: extend SOF_TIMESTAMPING_OPT_ID to HW timestamps
b2130366a952 can: raw: add support for SO_MARK
633a49e34b32 r8169: Fix PCI error on system resume
565460e180d9 net: sched: em_text: fix possible memory leak in em_text_destroy()
ac5cbe931c43 mlxbf_gige: fix receive packet race condition
6d7f45492706 ASoC: mediatek: mt8186: fix AUD_PAD_TOP register and offset
811604fb02c4 ASoC: fsl_rpmsg: Fix error handler with pm_runtime_enable
c3a37dc15685 igc: Check VLAN EtherType mask
6edff0b8381c igc: Check VLAN TCI mask
d27b98f4aeae igc: Report VLAN EtherType matching back to user
e76d1913f6a8 i40e: Fix filter input checks to prevent config with invalid values
188c9970d05e ice: Shut down VSI with "link-down-on-close" enabled
83b80170b7fa ice: Fix link_down_on_close message
f3f6a23e054c drm/i915/dp: Fix passing the correct DPCD_REV for drm_dp_set_phy_test_pattern 6cf7235bc1fb octeontx2-af: Fix marking couple of structure as __packed
a4b0a9b80a96 nfc: llcp_core: Hold a ref to llcp_local->dev when holding a ref to llcp_local 282e3fb61285 netfilter: nf_tables: set transport offset from mac header for netdev/egress 9487cc4c90fb netfilter: use skb_ip_totlen and iph_totlen
5f523f1beb46 drm/bridge: ti-sn65dsi86: Never store more than msg->size bytes in AUX xfer 3da4868907da wifi: iwlwifi: pcie: don't synchronize IRQs from IRQ
493d556278a3 KVM: x86/pmu: fix masking logic for MSR_CORE_PERF_GLOBAL_CTRL
3152a7d361c6 cifs: do not depend on release_iface for maintaining iface_list
5982a625fc0d cifs: cifs_chan_is_iface_active should be called with chan_lock held
4afcb82518b9 drm/mgag200: Fix gamma lut not initialized for G200ER, G200EV, G200SE
b9c370b61d73 Revert "PCI/ASPM: Remove pcie_aspm_pm_state_change()"
af9a5307656d mptcp: prevent tcp diag from closing listener subflows
105063f7f441 ALSA: hda/realtek: Fix mute and mic-mute LEDs for HP ProBook 440 G6
0fa3cf2d151e ALSA: hda/realtek: fix mute/micmute LEDs for a HP ZBook
beda900d3aaf ALSA: hda/realtek: enable SND_PCI_QUIRK for hp pavilion 14-ec1xxx series 9539e3b56e0d block: Don't invalidate pagecache for invalid falloc modes
079eefaecfd7 keys, dns: Fix missing size check of V1 server-list header
38fb82ecd144 Linux 6.1.71
74c4c7d57cf2 Revert "platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe" 7709b16bdbd5 tracing/kprobes: Fix symbol counting logic by looking at modules as well 9dd295341dc1 kallsyms: Make module_kallsyms_on_each_symbol generally available
29cb16577189 device property: Allow const parameter to dev_fwnode()
e7b04372179e spi: Constify spi parameters of chip select APIs
f9a01938e079 NFSD: fix possible oops when nfsd/pool_stats is closed.
899ac41804d8 ring-buffer: Fix slowpath of interrupted event
0105571f80ed netfilter: nf_tables: skip set commit for deleted/destroyed sets
4768430d5a69 ring-buffer: Remove useless update to write_stamp in rb_try_to_discard() f33c4e4cabce tracing: Fix blocked reader of snapshot buffer
09640899e6b7 ring-buffer: Fix wake ups when buffer_percent is set to 100
4ee9d9291b95 mm/memory-failure: check the mapcount of the precise page
fb21c9780a31 mm/memory-failure: cast index to loff_t before shifting it
be72d197b228 mm: migrate high-order folios in swap cache correctly
a8df791470fb mm/filemap: avoid buffered read/write race to read inconsistent data
b954b92ef08f platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe
7a3bbbadac4b ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
b9c5f0fd5cd5 block: renumber QUEUE_FLAG_HW_WC
e21b5fc5b887 spi: atmel: Fix clock issue when using devices with different polarities 025cf65f68d4 spi: Add APIs in spi core to set/get spi->chip_select and spi->cs_gpiod 64a4eb2982db spi: Reintroduce spi_set_cs_timing()
95e21657ffe9 linux/export: Ensure natural alignment of kcrctab array
bb4f791cb2de nfsd: call nfsd_last_thread() before final nfsd_put()
03d68ffc48b9 nfsd: separate nfsd_last_thread() from nfsd_put()
481561a431ff iio: imu: adis16475: add spi_device_id table
027eaeaf3294 spi: Introduce spi_get_device_match_data() helper
457a219c8453 usb: fotg210-hcd: delete an incorrect bounds test
119127273b5d ARM: dts: Fix occasional boot hang for am3 usb
98235bc13aa8 ksmbd: fix wrong allocation size update in smb2_open()
04b8e04f8f89 ksmbd: avoid duplicate opinfo_put() call on error of smb21_lease_break_ack() 34f7d5b5c972 ksmbd: lazy v2 lease break on smb2_write()
500c7a5e9af8 ksmbd: send v2 lease break notification for directory
1993959460c0 ksmbd: downgrade RWH lease caching state to RH for directory
2fcb46df3460 ksmbd: set v2 lease capability
3eddc811a7c8 ksmbd: set epoch in create context v2 lease
52a32eafd0a5 ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error
0bc46c2370ee ksmbd: move setting SMB2_FLAGS_ASYNC_COMMAND and AsyncId
d9aa5c19084e ksmbd: release interim response after sending status pending response
013bf453af0d ksmbd: move oplock handling after unlock parent dir
20dd92c23756 ksmbd: separately allocate ci per dentry
d5651972e5c5 ksmbd: fix possible deadlock in smb2_open
aabc944ebf08 ksmbd: prevent memory leak on error return
b4a269bb89dd ksmbd: fix kernel-doc comment of ksmbd_vfs_kern_path_locked()
699ad8d03cc5 ksmbd: no need to wait for binded connection termination at logoff
3cf44550814c ksmbd: add support for surrogate pair conversion
d26e024a5ead ksmbd: fix missing RDMA-capable flag for IPoIB device in ksmbd_rdma_capable_netdev() 5113f7222554 ksmbd: fix recursive locking in vfs helpers
42e56982bed1 ksmbd: fix kernel-doc comment of ksmbd_vfs_setxattr()
533e6dc4469f ksmbd: reorganize ksmbd_iov_pin_rsp()
1d95c5a54184 ksmbd: Remove unused field in ksmbd_user struct
5929e98f3bb7 ksmbd: fix potential double free on smb2_read_pipe() error path
a7aae713eaf2 ksmbd: fix Null pointer dereferences in ksmbd_update_fstate()
943cebf9ea34 ksmbd: fix wrong error response status by using set_smb2_rsp_status()
7b58ee8d0b91 ksmbd: fix race condition between tree conn lookup and disconnect
0090f0bfc225 ksmbd: fix race condition from parallel smb2 lock requests
6584ca894f30 ksmbd: fix race condition from parallel smb2 logoff requests
b3a843caed29 ksmbd: fix race condition with fp
7345f5dbf66d ksmbd: check iov vector index in ksmbd_conn_write()
8beae8a0a065 ksmbd: return invalid parameter error response if smb2 request is invalid e523a26c0567 ksmbd: fix passing freed memory 'aux_payload_buf'
b4b3fd1a95b4 ksmbd: remove unneeded mark_inode_dirty in set_info_sec()
1ee419e08fa1 ksmbd: remove experimental warning
83b01f7330d7 ksmbd: add missing calling smb2_set_err_rsp() on error
422c0cd01693 ksmbd: Fix one kernel-doc comment
c20105a8975c ksmbd: fix force create mode' and force directory mode'
f8cf1ebb7de6 ksmbd: fix wrong interim response on compound
9f297df20d93 ksmbd: add support for read compound
673e60c69124 ksmbd: switch to use kmemdup_nul() helper
0a9b91f45e88 ksmbd: check if a mount point is crossed during path lookup
d782f42eed93 ksmbd: Fix unsigned expression compared with zero
48cc49384048 ksmbd: Replace one-element array with flexible-array member
63fbfd212c82 ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect()
e7ab53bd81b0 ksmbd: Replace the ternary conditional operator with min()
143da652cee8 ksmbd: use kvzalloc instead of kvmalloc
de43cdaa88c2 ksmbd: Change the return value of ksmbd_vfs_query_maximal_access to void deb79f20be21 ksmbd: return a literal instead of 'err' in ksmbd_vfs_kern_path_locked() fe7977b872a6 ksmbd: use kzalloc() instead of __GFP_ZERO
294a275f374b ksmbd: remove unused ksmbd_tree_conn_share function
b069977b2b47 ksmbd: add mnt_want_write to ksmbd vfs functions
13a5045011ec ksmbd: fix posix_acls and acls dereferencing possible ERR_PTR()
1524884c3efb ksmbd: call putname after using the last component
30a1344198aa ksmbd: fix uninitialized pointer read in smb2_create_link()
6d4e21e369f3 ksmbd: fix uninitialized pointer read in ksmbd_vfs_rename()
6927ffe7479c ksmbd: fix racy issue from using ->d_parent and ->d_name
6e99fbb4296a fs: introduce lock_rename_child() helper
965eb8650737 ksmbd: remove unused compression negotiate ctx packing
49d9f6ad1ee0 ksmbd: avoid duplicate negotiate ctx offset increments
2182d96ec0b7 ksmbd: set NegotiateContextCount once instead of every inc
8d271ef5e5ca ksmbd: delete asynchronous work from list
4ef3fd2f85bb ksmbd: remove unused is_char_allowed function
226aaaa59365 ksmbd: Fix parameter name and comment mismatch
e8c49f9364c5 ksmbd: Fix spelling mistake "excceed" -> "exceeded"
ada8bcc48acd ksmbd: update Kconfig to note Kerberos support and fix indentation
5c0306b0abcd ksmbd: Remove duplicated codes
b6502c34cf30 ksmbd: fix typo, syncronous->synchronous
052b41ef2abe ksmbd: Implements sess->rpc_handle_list as xarray
264547e13f80 ksmbd: Convert to use sysfs_emit()/sysfs_emit_at() APIs
87ffbb9e24ba ksmbd: Fix resource leak in smb2_lock()
d847b7588341 ksmbd: use F_SETLK when unlocking a file
343d667deee1 ksmbd: set SMB2_SESSION_FLAG_ENCRYPT_DATA when enforcing data encryption for this share ab69d3e8f7a0 ksmbd: replace one-element arrays with flexible-array members
--- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +3 -3
@@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "c7164e4299dfbd93c9ec4f9bd307ebbb88aa6b71" -SRCREV_meta ?= "4fe5dc52631f3b990aefbb3f97330137c4ebb288" +SRCREV_machine ?= "6d67557b912380b57b6081da7ac106e9c003f4d1" +SRCREV_meta ?= "dd140f6b950d56c837dc464af8f2a2a53af24fbf" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.70" +LINUX_VERSION ?= "6.1.72" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +3 -3
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.70" +LINUX_VERSION ?= "6.1.72" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" -SRCREV_meta ?= "4fe5dc52631f3b990aefbb3f97330137c4ebb288" +SRCREV_machine ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" +SRCREV_meta ?= "dd140f6b950d56c837dc464af8f2a2a53af24fbf" PV = "${LINUX_VERSION}+git"
meta/recipes-kernel/linux/linux-yocto_6.1.bb +14 -14
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "b763843c7f0f71c1488daf5d7453656360bfd217" -SRCREV_machine:qemuarm64 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" -SRCREV_machine:qemuloongarch64 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" -SRCREV_machine:qemumips ?= "f72c516f5594f4eef9c26d380abf60768695c7da" -SRCREV_machine:qemuppc ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" -SRCREV_machine:qemuriscv64 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" -SRCREV_machine:qemuriscv32 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" -SRCREV_machine:qemux86 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" -SRCREV_machine:qemux86-64 ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" -SRCREV_machine:qemumips64 ?= "951e24cce7143380de09baa2d1d59062a969d021" -SRCREV_machine ?= "7d183bf1b0b8ded0b2a8a352aa75729a37293b1e" -SRCREV_meta ?= "4fe5dc52631f3b990aefbb3f97330137c4ebb288" +SRCREV_machine:qemuarm ?= "4b6d6ef48b0d11dfdcdc9ae25e1c83be9396a116" +SRCREV_machine:qemuarm64 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" +SRCREV_machine:qemuloongarch64 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" +SRCREV_machine:qemumips ?= "8a0e36da16bca1553532936c198c43362be35a82" +SRCREV_machine:qemuppc ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" +SRCREV_machine:qemuriscv64 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" +SRCREV_machine:qemuriscv32 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" +SRCREV_machine:qemux86 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" +SRCREV_machine:qemux86-64 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" +SRCREV_machine:qemumips64 ?= "3407157586b654c9932356124429ee9dc9f56f18" +SRCREV_machine ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" +SRCREV_meta ?= "dd140f6b950d56c837dc464af8f2a2a53af24fbf" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "a507f147e6f06e86b7649b46bc1d3caa34b196d6" +SRCREV_machine:class-devupstream ?= "7c58bfa711cb556ef1edc48e7dfa6d84e5fb8912" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base"
@@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.70" +LINUX_VERSION ?= "6.1.72" PV = "${LINUX_VERSION}+git"
Signature · 1 line
2.34.1
PATCH 9/23 linux-yocto/6.1: update CVE exclusions
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Data pulled from: https://github.com/nluedtke/linux_kernel_cves
1/1 [
Author: Nicholas Luedtke
Email: [email protected]
Subject: Update 27Dec23
Date: Wed, 27 Dec 2023 19:47:13 -0500
]--- meta/recipes-kernel/linux/cve-exclusion_6.1.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/cve-exclusion_6.1.inc +2 -2
@@ -1,9 +1,9 @@ # Auto-generated CVE metadata, DO NOT EDIT BY HAND. -# Generated at 2024-01-03 21:24:21.156991+00:00 for version 6.1.70 +# Generated at 2024-01-11 18:31:26.124059+00:00 for version 6.1.72 python check_kernel_cve_status_version() { - this_version = "6.1.70" + this_version = "6.1.72" kernel_version = d.getVar("LINUX_VERSION") if kernel_version != this_version: bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version))
Signature · 1 line
2.34.1
PATCH 10/23 linux-yocto/6.1: security/cfg: add configs to harden protection
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Integrating the following commit(s) to linux-yocto/.:
1/1 [
Author: Xiangyu Chen
Email: [email protected]
Subject: feature/security: add configs to harden protection
Date: Tue, 16 Jan 2024 18:22:31 +0800
Add some configs to harden protection:
CONFIG_HW_RANDOM_TPM=y Exposing the TPM's Random Number Generator as a hwrng device. CONFIG_DEBUG_WX=y Warn on W+X mappings at boot. CONFIG_SECURITY_DMESG_RESTRICT=y Restrict unprivileged access to the kernel syslog. CONFIG_LDISC_AUTOLOAD=n Disable automatically load TTY Line Disciplines.
]
--- meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +1 -1
@@ -15,7 +15,7 @@ python () { } SRCREV_machine ?= "6d67557b912380b57b6081da7ac106e9c003f4d1" -SRCREV_meta ?= "dd140f6b950d56c837dc464af8f2a2a53af24fbf" +SRCREV_meta ?= "74fa91143e9076e0d1d5ff0cca93987b3330bf27" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +1 -1
@@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_meta ?= "dd140f6b950d56c837dc464af8f2a2a53af24fbf" +SRCREV_meta ?= "74fa91143e9076e0d1d5ff0cca93987b3330bf27" PV = "${LINUX_VERSION}+git"
meta/recipes-kernel/linux/linux-yocto_6.1.bb +1 -1
@@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" SRCREV_machine:qemux86-64 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" SRCREV_machine:qemumips64 ?= "3407157586b654c9932356124429ee9dc9f56f18" SRCREV_machine ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_meta ?= "dd140f6b950d56c837dc464af8f2a2a53af24fbf" +SRCREV_meta ?= "74fa91143e9076e0d1d5ff0cca93987b3330bf27" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same
Signature · 1 line
2.34.1
PATCH 11/23 linux-yocto/6.1: update to v6.1.73
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating linux-yocto/6.1 to the latest korg -stable release that comprises the following commits:
fec3b1451d5f Linux 6.1.73
f9ee31dc7fcd cifs: fix flushing folio regression for 6.1 backport 0f22c8a6efe6 ipv6: remove max_size check inline with ipv4 b2c545c39877 Revert "nfsd: separate nfsd_last_thread() from nfsd_put()" db5f2f4db8b7 Revert "nfsd: call nfsd_last_thread() before final nfsd_put()"
--- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +3 -3
@@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "6d67557b912380b57b6081da7ac106e9c003f4d1" -SRCREV_meta ?= "74fa91143e9076e0d1d5ff0cca93987b3330bf27" +SRCREV_machine ?= "6fd0860ac9846438f226257ab515bcd612fdc379" +SRCREV_meta ?= "40dede8a165ea5894f172fede6baa0dd94d23fec" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.72" +LINUX_VERSION ?= "6.1.73" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +3 -3
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.72" +LINUX_VERSION ?= "6.1.73" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_meta ?= "74fa91143e9076e0d1d5ff0cca93987b3330bf27" +SRCREV_machine ?= "6c78fd37122b29c40bd8bb6f43aaa1ba7d6fb53a" +SRCREV_meta ?= "40dede8a165ea5894f172fede6baa0dd94d23fec" PV = "${LINUX_VERSION}+git"
meta/recipes-kernel/linux/linux-yocto_6.1.bb +14 -14
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "4b6d6ef48b0d11dfdcdc9ae25e1c83be9396a116" -SRCREV_machine:qemuarm64 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_machine:qemuloongarch64 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_machine:qemumips ?= "8a0e36da16bca1553532936c198c43362be35a82" -SRCREV_machine:qemuppc ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_machine:qemuriscv64 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_machine:qemuriscv32 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_machine:qemux86 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_machine:qemux86-64 ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_machine:qemumips64 ?= "3407157586b654c9932356124429ee9dc9f56f18" -SRCREV_machine ?= "d08880e7ec70e70249f80b8305da8e90bd47c606" -SRCREV_meta ?= "74fa91143e9076e0d1d5ff0cca93987b3330bf27" +SRCREV_machine:qemuarm ?= "45e6b64447b888e94af6fa8529cf976bf8116624" +SRCREV_machine:qemuarm64 ?= "6c78fd37122b29c40bd8bb6f43aaa1ba7d6fb53a" +SRCREV_machine:qemuloongarch64 ?= "6c78fd37122b29c40bd8bb6f43aaa1ba7d6fb53a" +SRCREV_machine:qemumips ?= "90ea25826ce7ef511d0d93ae33c3888f3b583bf3" +SRCREV_machine:qemuppc ?= "6c78fd37122b29c40bd8bb6f43aaa1ba7d6fb53a" +SRCREV_machine:qemuriscv64 ?= "6c78fd37122b29c40bd8bb6f43aaa1ba7d6fb53a" +SRCREV_machine:qemuriscv32 ?= "6c78fd37122b29c40bd8bb6f43aaa1ba7d6fb53a" +SRCREV_machine:qemux86 ?= "6c78fd37122b29c40bd8bb6f43aaa1ba7d6fb53a" +SRCREV_machine:qemux86-64 ?= "6c78fd37122b29c40bd8bb6f43aaa1ba7d6fb53a" +SRCREV_machine:qemumips64 ?= "59248cf67c17a987f898d9d0c81292cb5fcda858" +SRCREV_machine ?= "6c78fd37122b29c40bd8bb6f43aaa1ba7d6fb53a" +SRCREV_meta ?= "40dede8a165ea5894f172fede6baa0dd94d23fec" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "7c58bfa711cb556ef1edc48e7dfa6d84e5fb8912" +SRCREV_machine:class-devupstream ?= "fec3b1451d5febbc9e04250f879c10f8952e6bed" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base"
@@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.72" +LINUX_VERSION ?= "6.1.73" PV = "${LINUX_VERSION}+git"
Signature · 1 line
2.34.1
PATCH 12/23 linux-yocto/6.1: update CVE exclusions
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Data pulled from: https://github.com/nluedtke/linux_kernel_cves
1/1 [
Author: Nicholas Luedtke
Email: [email protected]
Subject: Update 15Jan24
Date: Mon, 15 Jan 2024 12:48:45 -0500
]--- .../linux/cve-exclusion_6.1.inc | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-)
meta/recipes-kernel/linux/cve-exclusion_6.1.inc +27 -7
@@ -1,9 +1,9 @@ # Auto-generated CVE metadata, DO NOT EDIT BY HAND. -# Generated at 2024-01-11 18:31:26.124059+00:00 for version 6.1.72 +# Generated at 2024-01-18 21:10:06.148505+00:00 for version 6.1.73 python check_kernel_cve_status_version() { - this_version = "6.1.72" + this_version = "6.1.73" kernel_version = d.getVar("LINUX_VERSION") if kernel_version != this_version: bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version))
@@ -4584,6 +4584,8 @@ CVE_STATUS[CVE-2022-48425] = "cpe-stable-backport: Backported in 6.1.33" CVE_STATUS[CVE-2022-48502] = "cpe-stable-backport: Backported in 6.1.40" +CVE_STATUS[CVE-2022-48619] = "fixed-version: Fixed from version 5.18rc1" + CVE_STATUS[CVE-2023-0030] = "fixed-version: Fixed from version 5.0rc1" CVE_STATUS[CVE-2023-0045] = "cpe-stable-backport: Backported in 6.1.5"
@@ -4644,7 +4646,7 @@ CVE_STATUS[CVE-2023-1118] = "cpe-stable-backport: Backported in 6.1.16" CVE_STATUS[CVE-2023-1192] = "cpe-stable-backport: Backported in 6.1.33" -# CVE-2023-1193 needs backporting (fixed from 6.3rc6) +CVE_STATUS[CVE-2023-1193] = "cpe-stable-backport: Backported in 6.1.71" CVE_STATUS[CVE-2023-1194] = "cpe-stable-backport: Backported in 6.1.34"
@@ -4666,6 +4668,8 @@ CVE_STATUS[CVE-2023-1382] = "fixed-version: Fixed from version 6.1rc7" CVE_STATUS[CVE-2023-1390] = "fixed-version: Fixed from version 5.11rc4" +# CVE-2023-1476 has no known resolution + CVE_STATUS[CVE-2023-1513] = "cpe-stable-backport: Backported in 6.1.13" CVE_STATUS[CVE-2023-1582] = "fixed-version: Fixed from version 5.17rc4"
@@ -5088,7 +5092,7 @@ CVE_STATUS[CVE-2023-45871] = "cpe-stable-backport: Backported in 6.1.53" CVE_STATUS[CVE-2023-45898] = "fixed-version: only affects 6.5rc1 onwards" -# CVE-2023-4610 needs backporting (fixed from 6.4) +CVE_STATUS[CVE-2023-4610] = "fixed-version: only affects 6.4rc1 onwards" CVE_STATUS[CVE-2023-4611] = "fixed-version: only affects 6.4rc1 onwards"
@@ -5112,7 +5116,7 @@ CVE_STATUS[CVE-2023-5090] = "cpe-stable-backport: Backported in 6.1.62" CVE_STATUS[CVE-2023-5158] = "cpe-stable-backport: Backported in 6.1.57" -# CVE-2023-51779 needs backporting (fixed from 6.7rc7) +CVE_STATUS[CVE-2023-51779] = "cpe-stable-backport: Backported in 6.1.70" CVE_STATUS[CVE-2023-5178] = "cpe-stable-backport: Backported in 6.1.60"
@@ -5134,6 +5138,8 @@ CVE_STATUS[CVE-2023-5972] = "fixed-version: only affects 6.2rc1 onwards" # CVE-2023-6039 needs backporting (fixed from 6.5rc5) +CVE_STATUS[CVE-2023-6040] = "fixed-version: Fixed from version 5.18rc1" + CVE_STATUS[CVE-2023-6111] = "fixed-version: only affects 6.6rc3 onwards" CVE_STATUS[CVE-2023-6121] = "cpe-stable-backport: Backported in 6.1.65"
@@ -5142,8 +5148,12 @@ CVE_STATUS[CVE-2023-6176] = "cpe-stable-backport: Backported in 6.1.54" # CVE-2023-6238 has no known resolution +# CVE-2023-6270 has no known resolution + # CVE-2023-6356 has no known resolution +CVE_STATUS[CVE-2023-6531] = "cpe-stable-backport: Backported in 6.1.68" + # CVE-2023-6535 has no known resolution # CVE-2023-6536 has no known resolution
@@ -5152,13 +5162,13 @@ CVE_STATUS[CVE-2023-6546] = "cpe-stable-backport: Backported in 6.1.47" # CVE-2023-6560 needs backporting (fixed from 6.7rc4) -# CVE-2023-6606 needs backporting (fixed from 6.7rc7) +CVE_STATUS[CVE-2023-6606] = "cpe-stable-backport: Backported in 6.1.70" # CVE-2023-6610 needs backporting (fixed from 6.7rc7) CVE_STATUS[CVE-2023-6622] = "cpe-stable-backport: Backported in 6.1.68" -# CVE-2023-6679 needs backporting (fixed from 6.7rc6) +CVE_STATUS[CVE-2023-6679] = "fixed-version: only affects 6.7rc1 onwards" CVE_STATUS[CVE-2023-6817] = "cpe-stable-backport: Backported in 6.1.68"
@@ -5168,3 +5178,13 @@ CVE_STATUS[CVE-2023-6932] = "cpe-stable-backport: Backported in 6.1.66" # CVE-2023-7042 has no known resolution +CVE_STATUS[CVE-2023-7192] = "cpe-stable-backport: Backported in 6.1.18" + +CVE_STATUS[CVE-2024-0193] = "fixed-version: only affects 6.5rc6 onwards" + +# CVE-2024-0340 needs backporting (fixed from 6.4rc6) + +CVE_STATUS[CVE-2024-0443] = "fixed-version: only affects 6.2rc1 onwards" + +# Skipping dd=CVE-2023-1476, no affected_versions +
Signature · 1 line
2.34.1
PATCH 13/23 nfs-utils: Update Upstream-Status
In reply to Steve SakomanFrom: Robert Yang <[email protected]>
Update Upstream-Status for 0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch.
--- .../0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch +1 -1
@@ -9,7 +9,7 @@ reexport.c:62:17: error: implicit declaration of function 'sleep' [-Werror=impli 62 | sleep(1); -Upstream-Status: Pending +Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=170254661824522&w=2] Signed-off-by: Robert Yang <[email protected]> ---
Signature · 1 line
2.34.1
PATCH 14/23 python3-license-expression: Fix the ptest failure
In reply to Steve SakomanFrom: Mingli Yu <[email protected]>
Fix the below ptest failure:
self = <test_skeleton_codestyle.BaseTests testMethod=test_skeleton_codestyle> def test_skeleton_codestyle(self):
"""
This test shouldn't run in proliferated repositories.
"""
setup_cfg = configparser.ConfigParser() setup_cfg.read("setup.cfg")
Quoted 1 line
if setup_cfg["metadata"]["name"] != "skeleton":
tests/test_skeleton_codestyle.py:22:
self = <configparser.ConfigParser object at 0x7fd87cf55110>, key = 'metadata' def _getitem_(self, key):
if key != self.default_section and not self.has_section(key):
Quoted 1 line
raise KeyError(key)
E KeyError: 'metadata'
After the patch:
# ./run-ptest [snip] PASS: tests/test_license_expression.py::LicensingValidateTest::test_validation_bad_syntax PASS: tests/test_license_expression.py::LicensingValidateTest::test_validation_exception_as_regular_key PASS: tests/test_license_expression.py::LicensingValidateTest::test_validation_exception_with_choice PASS: tests/test_license_expression.py::LicensingValidateTest::test_validation_invalid_license_exception PASS: tests/test_license_expression.py::LicensingValidateTest::test_validation_invalid_license_exception_strict_false PASS: tests/test_license_expression.py::LicensingValidateTest::test_validation_invalid_license_key PASS: tests/test_license_expression.py::UtilTest::test_build_licensing PASS: tests/test_license_expression.py::UtilTest::test_build_spdx_licensing PASS: tests/test_license_expression.py::UtilTest::test_get_license_key_info PASS: tests/test_license_expression.py::UtilTest::test_get_license_key_info_vendored PASS: tests/test_license_expression.py::CombineExpressionTest::test_combine_expressions_with_duplicated_elements PASS: tests/test_license_expression.py::CombineExpressionTest::test_combine_expressions_with_empty_input PASS: tests/test_license_expression.py::CombineExpressionTest::test_combine_expressions_with_or_relationship PASS: tests/test_license_expression.py::CombineExpressionTest::test_combine_expressions_with_regular PASS: tests/test_skeleton_codestyle.py::BaseTests::test_skeleton_codestyle ============================================================================ Testsuite summary # TOTAL: 175 # PASS: 175 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0
Changed in v4:
Add python3-license-expression to PTESTS_FAST
--- .../python/python3-license-expression/run-ptest | 2 +- .../python/python3-license-expression_30.1.1.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
meta/recipes-devtools/python/python3-license-expression/run-ptest +1 -1
@@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest --automake
meta/recipes-devtools/python/python3-license-expression_30.1.1.bb +2 -0
@@ -26,6 +26,7 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() {
@@ -33,4 +34,5 @@ do_install_ptest() { install -d ${D}${PTEST_PATH}/src cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ cp -rf ${S}/src/* ${D}${PTEST_PATH}/src/ + cp -rf ${S}/setup.cfg ${D}${PTEST_PATH}/ }
Signature · 1 line
2.34.1
PATCH 15/23 dtc: preserve version also from shallow git clones
In reply to Steve SakomanFrom: Peter Marko <[email protected]>
Since switch from Makefile to meson based build, the version is no longer hardcoded but queried from git tag.
This works only if git history is available. When shallow tarballs are used, tag is not available.
Example error for trusted-firmware-a from meta-arm:
dtc version too old (039a994), you need at least version 1.4.4
Backport also patch to fix version in meson file.
--- ...01-meson.build-bump-version-to-1.7.0.patch | 29 ++++++++++++++ ...n-allow-building-from-shallow-clones.patch | 38 +++++++++++++++++++ meta/recipes-kernel/dtc/dtc_1.7.0.bb | 6 ++- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch create mode 100644 meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 9153522103bd4ed7e3299c4d073f66bb37cb2d42 Mon Sep 17 00:00:00 2001 +From: Nikolay Letov <[email protected]> +Date: Wed, 22 Feb 2023 13:36:07 +0300 +Subject: [PATCH 1/2] meson.build: bump version to 1.7.0 + +[This was botched in the actual 1.7.0 release :( - David Gibson] + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=64a907f08b9bedd89833c1eee674148cff2343c6] + +Signed-off-by: Nikolay Letov <[email protected]> +Signed-off-by: Peter Marko <[email protected]> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 78251eb..d88cd9f 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,5 +1,5 @@ + project('dtc', 'c', +- version: '1.6.0', ++ version: '1.7.0', + license: ['GPL2+', 'BSD-2'], + default_options: 'werror=true', + ) +-- +2.30.2 +
meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 4415b0baece3c4351a6d3637c2754abbefd4795d Mon Sep 17 00:00:00 2001 +From: Peter Marko <[email protected]> +Date: Sat, 16 Dec 2023 18:58:31 +0100 +Subject: [PATCH 2/2] meson: allow building from shallow clones + +When building from shallow clone, tag is not available +and version defaults to git hash. +Problem is that some builds check DTC version and fail the comparison. +Example is https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git +Which fails to build with following error: +dtc version too old (039a994), you need at least version 1.4.4 + +Drop --always from git describe command, see +https://github.com/mesonbuild/meson/blob/1.3.0/mesonbuild/utils/universal.py#L773 +This will make it more closer to build via Makefile. + +Upstream-Status: Submitted [https://github.com/dgibson/dtc/pull/122] + +Signed-off-by: Peter Marko <[email protected]> +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 78251eb..fc0c92a 100644 +--- a/meson.build ++++ b/meson.build +@@ -56,6 +56,7 @@ py = py.find_installation(required: get_option('python')) + swig = find_program('swig', required: get_option('python')) + + version_gen_h = vcs_tag( ++ command: ['git', 'describe', '--dirty=+'], + input: 'version_gen.h.in', + output: 'version_gen.h', + ) +-- +2.30.2 +
meta/recipes-kernel/dtc/dtc_1.7.0.bb +5 -1
@@ -8,7 +8,11 @@ LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927 \ file://README.license;md5=a1eb22e37f09df5b5511b8a278992d0e" -SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main;protocol=https" +SRC_URI = " \ + git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main;protocol=https \ + file://0001-meson.build-bump-version-to-1.7.0.patch \ + file://0002-meson-allow-building-from-shallow-clones.patch \ +" SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.34.1
PATCH 16/23 curl: Disable two intermittently failing tests
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
These two tests seem to fail semi-regularly so just stop running them.
--- meta/recipes-support/curl/curl/disable-tests | 6 ++++++ 1 file changed, 6 insertions(+)
meta/recipes-support/curl/curl/disable-tests +6 -0
@@ -1,9 +1,15 @@ +# Intermittently fails e.g. https://autobuilder.yocto.io/pub/non-release/20231220-28/testresults/qemux86-64-ptest/curl.log +# https://autobuilder.yocto.io/pub/non-release/20231220-27/testresults/qemux86-64-ptest/curl.log +337 # These CRL test (alt-avc) are failing 356 412 413 # These CRL tests are scanning docs 971 +# Intermittently hangs e.g https://autobuilder.yocto.io/pub/non-release/20231220-27/testresults/qemux86-64-ptest/curl.log +1096 +# These CRL tests are scanning docs 1119 1132 1135
Signature · 1 line
2.34.1
PATCH 17/23 devtool: deploy: provide max_process to strip_execs
In reply to Steve SakomanFrom: Clay Chang <[email protected]>
Use oe.utils.get_bb_number_threads to get max_process
--- scripts/lib/devtool/deploy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/lib/devtool/deploy.py +2 -1
@@ -140,6 +140,7 @@ def deploy(args, config, basepath, workspace): import math import oe.recipeutils import oe.package + import oe.utils check_workspace_recipe(workspace, args.recipename, checksrc=False)
@@ -174,7 +175,7 @@ def deploy(args, config, basepath, workspace): exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH') or '']) oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP'), rd.getVar('libdir'), - rd.getVar('base_libdir'), rd) + rd.getVar('base_libdir'), oe.utils.get_bb_number_threads(rd), rd) filelist = [] inodes = set({})
Signature · 1 line
2.34.1
PATCH 18/23 ncurses: Fix - tty is hung after reset
In reply to Steve SakomanFrom: Soumya Sambu <[email protected]>
Serial tty is hung after reset command -
$echo "test " >> /dev/ttyS0
test
$stty -a < /dev/ttyS0
speed 115200 baud; rows 34; columns 153; line = 0;
intr = ^C; quit = ^\; erase = ^?; kill = ^U; eof = ^D; eol = <undef>; eol2 = <undef>; swtch = <undef>; start = ^Q; stop = ^S; susp = ^Z; rprnt = ^R;
werase = ^W; lnext = ^V; discard = ^O; min = 1; time = 0;
-parenb -parodd -cmspar cs8 hupcl -cstopb cread clocal -crtscts
-ignbrk -brkint -ignpar -parmrk -inpck -istrip -inlcr -igncr icrnl ixon ixoff -iuclc -ixany -imaxbel iutf8 opost -olcuc -ocrnl onlcr -onocr -onlret -ofill -ofdel nl0 cr0 tab0 bs0 vt0 ff0
isig icanon -iexten echo echoe echok -echonl -noflsh -xcase -tostop -echoprt echoctl echoke -flusho -extproc $reset
$echo "test " >> /dev/ttyS0
^C
$stty -a < /dev/ttyS0
^C
Updating reset_tty_settings API with latest code which fixes tty hung issue
--- ...eset-code-ncurses-6.4-patch-20231104.patch | 499 ++++++++++++++++++ meta/recipes-core/ncurses/ncurses_6.4.bb | 1 + 2 files changed, 500 insertions(+) create mode 100644 meta/recipes-core/ncurses/files/0001-Updating-reset-code-ncurses-6.4-patch-20231104.patch
meta/recipes-core/ncurses/files/0001-Updating-reset-code-ncurses-6.4-patch-20231104.patch new file +499 -0
@@ -0,0 +1,499 @@ +From 135d37072755704b8d018e5de74e62ff3f28c930 Mon Sep 17 00:00:00 2001 +From: Thomas E. Dickey <[email protected]> +Date: Sun, 5 Nov 2023 05:54:54 +0530 +Subject: [PATCH] Updating reset code - ncurses 6.4 - patch 20231104 + ++ modify reset command to avoid altering clocal if the terminal uses a + modem (prompted by discussion with Werner Fink, Michal Suchanek, + OpenSUSE #1201384, Debian #60377). ++ build-fixes for --with-caps variations. ++ correct a couple of section-references in INSTALL. + +Signed-off-by: Thomas E. Dickey <[email protected]> + +Upstream-Status: Backport [https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=135d37072755704b8d018e5de74e62ff3f28c930] + +Signed-off-by: Soumya Sambu <[email protected]> +--- + INSTALL | 8 +- + include/curses.events | 2 +- + ncurses/tinfo/lib_tparm.c | 2 + + progs/reset_cmd.c | 281 +++++++++++++++++++++----------------- + progs/tabs.c | 10 +- + progs/tic.c | 4 + + 6 files changed, 176 insertions(+), 131 deletions(-) + +diff --git a/INSTALL b/INSTALL +index d9c1dd12..d0a39af0 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -47,7 +47,7 @@ If you are converting from BSD curses and do not have root access, be sure + to read the BSD CONVERSION NOTES section below. + + If you are trying to build applications using gpm with ncurses, +-read the USING NCURSES WITH GPM section below. ++read the USING GPM section below. + + If you are cross-compiling, see the note below on BUILDING WITH A CROSS-COMPILER. + +@@ -79,7 +79,7 @@ INSTALLATION PROCEDURE: + The --prefix option to configure changes the root directory for installing + ncurses. The default is normally in subdirectories of /usr/local, except + for systems where ncurses is normally installed as a system library (see +- "IF YOU ARE A SYSTEM INTEGRATOR"). Use --prefix=/usr to replace your ++ "FOR SYSTEM INTEGRATORS"). Use --prefix=/usr to replace your + default curses distribution. + + The package gets installed beneath the --prefix directory as follows: +@@ -176,7 +176,7 @@ INSTALLATION PROCEDURE: + You can make curses and terminfo fall back to an existing file of termcap + definitions by configuring with --enable-termcap. If you do this, the + library will search /etc/termcap before the terminfo database, and will +- also interpret the contents of the TERM environment variable. See the ++ also interpret the contents of the $TERM environment variable. See the + section BSD CONVERSION NOTES below. + + 3. Type `make'. Ignore any warnings, no error messages should be produced. +@@ -1231,7 +1231,7 @@ CONFIGURE OPTIONS: + Specify a search-list of terminfo directories which will be compiled + into the ncurses library (default: DATADIR/terminfo) + +- This is a colon-separated list, like the TERMINFO_DIRS environment ++ This is a colon-separated list, like the $TERMINFO_DIRS environment + variable. + + --with-termlib[=XXX] +diff --git a/include/curses.events b/include/curses.events +index 25a2583f..468bde18 100644 +--- a/include/curses.events ++++ b/include/curses.events +@@ -50,6 +50,6 @@ typedef struct + extern NCURSES_EXPORT(int) wgetch_events (WINDOW *, _nc_eventlist *) GCC_DEPRECATED(experimental option); /* experimental */ + extern NCURSES_EXPORT(int) wgetnstr_events (WINDOW *,char *,int,_nc_eventlist *) GCC_DEPRECATED(experimental option); /* experimental */ + +-#define KEY_EVENT 0633 /* We were interrupted by an event */ ++#define KEY_EVENT 0634 /* We were interrupted by an event */ + + #endif /* NCURSES_WGETCH_EVENTS */ +diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c +index a10a3877..cd972c0f 100644 +--- a/ncurses/tinfo/lib_tparm.c ++++ b/ncurses/tinfo/lib_tparm.c +@@ -1113,8 +1113,10 @@ check_string_caps(TPARM_DATA *data, const char *string) + want_type = 2; /* function key #1, transmit string #2 */ + else if (CHECK_CAP(plab_norm)) + want_type = 2; /* label #1, show string #2 */ ++#ifdef pkey_plab + else if (CHECK_CAP(pkey_plab)) + want_type = 6; /* function key #1, type string #2, show string #3 */ ++#endif + #if NCURSES_XNAMES + else { + char *check; +diff --git a/progs/reset_cmd.c b/progs/reset_cmd.c +index eff3af72..aec4b077 100644 +--- a/progs/reset_cmd.c ++++ b/progs/reset_cmd.c +@@ -75,6 +75,9 @@ MODULE_ID("$Id: reset_cmd.c,v 1.28 2021/10/02 18:08:44 tom Exp $") + # endif + #endif + ++#define set_flags(target, mask) target |= mask ++#define clear_flags(target, mask) target &= ~((unsigned)(mask)) ++ + static FILE *my_file; + + static bool use_reset = FALSE; /* invoked as reset */ +@@ -188,6 +191,79 @@ out_char(int c) + #define reset_char(item, value) \ + tty_settings->c_cc[item] = CHK(tty_settings->c_cc[item], value) + ++/* ++ * Simplify ifdefs ++ */ ++#ifndef BSDLY ++#define BSDLY 0 ++#endif ++#ifndef CRDLY ++#define CRDLY 0 ++#endif ++#ifndef ECHOCTL ++#define ECHOCTL 0 ++#endif ++#ifndef ECHOKE ++#define ECHOKE 0 ++#endif ++#ifndef ECHOPRT ++#define ECHOPRT 0 ++#endif ++#ifndef FFDLY ++#define FFDLY 0 ++#endif ++#ifndef IMAXBEL ++#define IMAXBEL 0 ++#endif ++#ifndef IUCLC ++#define IUCLC 0 ++#endif ++#ifndef IXANY ++#define IXANY 0 ++#endif ++#ifndef NLDLY ++#define NLDLY 0 ++#endif ++#ifndef OCRNL ++#define OCRNL 0 ++#endif ++#ifndef OFDEL ++#define OFDEL 0 ++#endif ++#ifndef OFILL ++#define OFILL 0 ++#endif ++#ifndef OLCUC ++#define OLCUC 0 ++#endif ++#ifndef ONLCR ++#define ONLCR 0 ++#endif ++#ifndef ONLRET ++#define ONLRET 0 ++#endif ++#ifndef ONOCR ++#define ONOCR 0 ++#endif ++#ifndef OXTABS ++#define OXTABS 0 ++#endif ++#ifndef TAB3 ++#define TAB3 0 ++#endif ++#ifndef TABDLY ++#define TABDLY 0 ++#endif ++#ifndef TOSTOP ++#define TOSTOP 0 ++#endif ++#ifndef VTDLY ++#define VTDLY 0 ++#endif ++#ifndef XCASE ++#define XCASE 0 ++#endif ++ + /* + * Reset the terminal mode bits to a sensible state. Very useful after + * a child program dies in raw mode. +@@ -195,6 +271,10 @@ out_char(int c) + void + reset_tty_settings(int fd, TTY * tty_settings, int noset) + { ++ unsigned mask; ++#ifdef TIOCMGET ++ int modem_bits; ++#endif + GET_TTY(fd, tty_settings); + + #ifdef TERMIOS +@@ -228,106 +308,65 @@ reset_tty_settings(int fd, TTY * tty_settings, int noset) + reset_char(VWERASE, CWERASE); + #endif + +- tty_settings->c_iflag &= ~((unsigned) (IGNBRK +- | PARMRK +- | INPCK +- | ISTRIP +- | INLCR +- | IGNCR +-#ifdef IUCLC +- | IUCLC +-#endif +-#ifdef IXANY +- | IXANY +-#endif +- | IXOFF)); +- +- tty_settings->c_iflag |= (BRKINT +- | IGNPAR +- | ICRNL +- | IXON +-#ifdef IMAXBEL +- | IMAXBEL +-#endif +- ); +- +- tty_settings->c_oflag &= ~((unsigned) (0 +-#ifdef OLCUC +- | OLCUC +-#endif +-#ifdef OCRNL +- | OCRNL +-#endif +-#ifdef ONOCR +- | ONOCR +-#endif +-#ifdef ONLRET +- | ONLRET +-#endif +-#ifdef OFILL +- | OFILL +-#endif +-#ifdef OFDEL +- | OFDEL +-#endif +-#ifdef NLDLY +- | NLDLY +-#endif +-#ifdef CRDLY +- | CRDLY +-#endif +-#ifdef TABDLY +- | TABDLY +-#endif +-#ifdef BSDLY +- | BSDLY +-#endif +-#ifdef VTDLY +- | VTDLY +-#endif +-#ifdef FFDLY +- | FFDLY +-#endif +- )); +- +- tty_settings->c_oflag |= (OPOST +-#ifdef ONLCR +- | ONLCR +-#endif +- ); +- +- tty_settings->c_cflag &= ~((unsigned) (CSIZE +- | CSTOPB +- | PARENB +- | PARODD +- | CLOCAL)); +- tty_settings->c_cflag |= (CS8 | CREAD); +- tty_settings->c_lflag &= ~((unsigned) (ECHONL +- | NOFLSH +-#ifdef TOSTOP +- | TOSTOP +-#endif +-#ifdef ECHOPTR +- | ECHOPRT +-#endif +-#ifdef XCASE +- | XCASE +-#endif +- )); +- +- tty_settings->c_lflag |= (ISIG +- | ICANON +- | ECHO +- | ECHOE +- | ECHOK +-#ifdef ECHOCTL +- | ECHOCTL +-#endif +-#ifdef ECHOKE +- | ECHOKE +-#endif +- ); +-#endif ++ clear_flags(tty_settings->c_iflag, (IGNBRK ++ | PARMRK ++ | INPCK ++ | ISTRIP ++ | INLCR ++ | IGNCR ++ | IUCLC ++ | IXANY ++ | IXOFF)); ++ ++ set_flags(tty_settings->c_iflag, (BRKINT ++ | IGNPAR ++ | ICRNL ++ | IXON ++ | IMAXBEL)); ++ ++ clear_flags(tty_settings->c_oflag, (0 ++ | OLCUC ++ | OCRNL ++ | ONOCR ++ | ONLRET ++ | OFILL ++ | OFDEL ++ | NLDLY ++ | CRDLY ++ | TABDLY ++ | BSDLY ++ | VTDLY ++ | FFDLY)); ++ ++ set_flags(tty_settings->c_oflag, (OPOST ++ | ONLCR)); ++ ++ mask = (CSIZE | CSTOPB | PARENB | PARODD); ++#ifdef TIOCMGET ++ /* leave clocal alone if this appears to use a modem */ ++ if (ioctl(fd, TIOCMGET, &modem_bits) == -1) ++ mask |= CLOCAL; ++#else ++ /* cannot check - use the behavior from tset */ ++ mask |= CLOCAL; ++#endif ++ clear_flags(tty_settings->c_cflag, mask); ++ ++ set_flags(tty_settings->c_cflag, (CS8 | CREAD)); ++ clear_flags(tty_settings->c_lflag, (ECHONL ++ | NOFLSH ++ | TOSTOP ++ | ECHOPRT ++ | XCASE)); ++ ++ set_flags(tty_settings->c_lflag, (ISIG ++ | ICANON ++ | ECHO ++ | ECHOE ++ | ECHOK ++ | ECHOCTL ++ | ECHOKE)); ++#endif /* TERMIOS */ + + if (!noset) { + SET_TTY(fd, tty_settings); +@@ -402,29 +441,23 @@ set_conversions(TTY * tty_settings) + #if defined(EXP_WIN32_DRIVER) + /* FIXME */ + #else +-#ifdef ONLCR +- tty_settings->c_oflag |= ONLCR; +-#endif +- tty_settings->c_iflag |= ICRNL; +- tty_settings->c_lflag |= ECHO; +-#ifdef OXTABS +- tty_settings->c_oflag |= OXTABS; +-#endif /* OXTABS */ ++ set_flags(tty_settings->c_oflag, ONLCR); ++ set_flags(tty_settings->c_iflag, ICRNL); ++ set_flags(tty_settings->c_lflag, ECHO); ++ set_flags(tty_settings->c_oflag, OXTABS); + + /* test used to be tgetflag("NL") */ + if (VALID_STRING(newline) && newline[0] == '\n' && !newline[1]) { + /* Newline, not linefeed. */ +-#ifdef ONLCR +- tty_settings->c_oflag &= ~((unsigned) ONLCR); +-#endif +- tty_settings->c_iflag &= ~((unsigned) ICRNL); ++ clear_flags(tty_settings->c_oflag, ONLCR); ++ clear_flags(tty_settings->c_iflag, ICRNL); + } +-#ifdef OXTABS ++#if OXTABS + /* test used to be tgetflag("pt") */ + if (VALID_STRING(set_tab) && VALID_STRING(clear_all_tabs)) +- tty_settings->c_oflag &= ~OXTABS; ++ clear_flags(tty_settings->c_oflag, OXTABS); + #endif /* OXTABS */ +- tty_settings->c_lflag |= (ECHOE | ECHOK); ++ set_flags(tty_settings->c_lflag, (ECHOE | ECHOK)); + #endif + } + +@@ -490,7 +523,7 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings) + bool need_flush = FALSE; + + (void) old_settings; +-#ifdef TAB3 ++#if TAB3 + if (old_settings != 0 && + old_settings->c_oflag & (TAB3 | ONLCR | OCRNL | ONLRET)) { + old_settings->c_oflag &= (TAB3 | ONLCR | OCRNL | ONLRET); +@@ -512,22 +545,22 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings) + + if (VALID_STRING(clear_margins)) { + need_flush |= sent_string(clear_margins); +- } else ++ } + #if defined(set_lr_margin) +- if (VALID_STRING(set_lr_margin)) { ++ else if (VALID_STRING(set_lr_margin)) { + need_flush |= sent_string(TIPARM_2(set_lr_margin, 0, columns - 1)); +- } else ++ } + #endif + #if defined(set_left_margin_parm) && defined(set_right_margin_parm) +- if (VALID_STRING(set_left_margin_parm) +- && VALID_STRING(set_right_margin_parm)) { ++ else if (VALID_STRING(set_left_margin_parm) ++ && VALID_STRING(set_right_margin_parm)) { + need_flush |= sent_string(TIPARM_1(set_left_margin_parm, 0)); + need_flush |= sent_string(TIPARM_1(set_right_margin_parm, + columns - 1)); +- } else ++ } + #endif +- if (VALID_STRING(set_left_margin) +- && VALID_STRING(set_right_margin)) { ++ else if (VALID_STRING(set_left_margin) ++ && VALID_STRING(set_right_margin)) { + need_flush |= to_left_margin(); + need_flush |= sent_string(set_left_margin); + if (VALID_STRING(parm_right_cursor)) { +diff --git a/progs/tabs.c b/progs/tabs.c +index 7378d116..d904330b 100644 +--- a/progs/tabs.c ++++ b/progs/tabs.c +@@ -370,7 +370,9 @@ do_set_margin(int margin, bool no_op) + } + tputs(set_left_margin, 1, putch); + } +- } else if (VALID_STRING(set_left_margin_parm)) { ++ } ++#if defined(set_left_margin_parm) && defined(set_right_margin_parm) ++ else if (VALID_STRING(set_left_margin_parm)) { + result = TRUE; + if (!no_op) { + if (VALID_STRING(set_right_margin_parm)) { +@@ -379,12 +381,16 @@ do_set_margin(int margin, bool no_op) + tputs(TIPARM_2(set_left_margin_parm, margin, max_cols), 1, putch); + } + } +- } else if (VALID_STRING(set_lr_margin)) { ++ } ++#endif ++#if defined(set_lr_margin) ++ else if (VALID_STRING(set_lr_margin)) { + result = TRUE; + if (!no_op) { + tputs(TIPARM_2(set_lr_margin, margin, max_cols), 1, putch); + } + } ++#endif + return result; + } + +diff --git a/progs/tic.c b/progs/tic.c +index 888927e2..78b568fa 100644 +--- a/progs/tic.c ++++ b/progs/tic.c +@@ -3142,6 +3142,7 @@ guess_ANSI_VTxx(TERMTYPE2 *tp) + * In particular, any ECMA-48 terminal should support these, though the details + * for u9 are implementation dependent. + */ ++#if defined(user6) && defined(user7) && defined(user8) && defined(user9) + static void + check_user_6789(TERMTYPE2 *tp) + { +@@ -3177,6 +3178,9 @@ check_user_6789(TERMTYPE2 *tp) + break; + } + } ++#else ++#define check_user_6789(tp) /* nothing */ ++#endif + + /* other sanity-checks (things that we don't want in the normal + * logic that reads a terminfo entry) +-- +2.40.0
meta/recipes-core/ncurses/ncurses_6.4.bb +1 -0
@@ -5,6 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ file://exit_prototype.patch \ file://0001-Fix-CVE-2023-29491.patch \ + file://0001-Updating-reset-code-ncurses-6.4-patch-20231104.patch \ " # commit id corresponds to the revision in package version SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f"
Signature · 1 line
2.34.1
PATCH 19/23 uninative-tarball.xz - reproducibility fix
In reply to Steve SakomanFrom: Robert Berger <[email protected]>
added --clamp-mtime --mtime to the tar command
see:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=15148
--- meta/classes-recipe/populate_sdk_base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/populate_sdk_base.bbclass +1 -1
@@ -285,7 +285,7 @@ python check_sdk_sysroots() { dir_walk(SCAN_ROOT) } -SDKTAROPTS = "--owner=root --group=root" +SDKTAROPTS = "--owner=root --group=root --clamp-mtime --mtime=@${SOURCE_DATE_EPOCH}" fakeroot archive_sdk() { # Package it up
Signature · 1 line
2.34.1
PATCH 20/23 classes-global/sstate: Fix variable typo
In reply to Steve SakomanFrom: Joshua Watt <[email protected]>
The vardepsexclude was subtly wrong in that it referenced STATE_MANMACH when the actual variable name is SSTATE_MANMACH.
--- meta/classes-global/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-global/sstate.bbclass +1 -1
@@ -336,7 +336,7 @@ def sstate_install(ss, d): for lock in locks: bb.utils.unlockfile(lock) -sstate_install[vardepsexclude] += "SSTATE_ALLOW_OVERLAP_FILES STATE_MANMACH SSTATE_MANFILEPREFIX" +sstate_install[vardepsexclude] += "SSTATE_ALLOW_OVERLAP_FILES SSTATE_MANMACH SSTATE_MANFILEPREFIX" sstate_install[vardeps] += "${SSTATEPOSTINSTFUNCS}" def sstate_installpkg(ss, d):
Signature · 1 line
2.34.1
PATCH 21/23 lib/prservice: Improve lock handling robustness
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
It is possible we could crash holding a lock whilst parsing in this code. Switch to use utils.fileslocked() in the with expression to avoid this.
This may be causing some of our strange intermittent failures in PRServ tests.
--- meta/lib/oe/prservice.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
meta/lib/oe/prservice.py +1 -3
@@ -78,8 +78,7 @@ def prserv_export_tofile(d, metainfo, datainfo, lockdown, nomax=False): bb.utils.mkdirhier(d.getVar('PRSERV_DUMPDIR')) df = d.getVar('PRSERV_DUMPFILE') #write data - lf = bb.utils.lockfile("%s.lock" % df) - with open(df, "a") as f: + with open(df, "a") as f, bb.utils.fileslocked(["%s.lock" % df]) as locks: if metainfo: #dump column info f.write("#PR_core_ver = \"%s\"\n\n" % metainfo['core_ver']);
@@ -113,7 +112,6 @@ def prserv_export_tofile(d, metainfo, datainfo, lockdown, nomax=False): if not nomax: for i in idx: f.write("PRAUTO_%s_%s = \"%s\"\n" % (str(datainfo[idx[i]]['version']),str(datainfo[idx[i]]['pkgarch']),str(datainfo[idx[i]]['value']))) - bb.utils.unlockfile(lf) def prserv_check_avail(d): host_params = list([_f for _f in (d.getVar("PRSERV_HOST") or '').split(':') if _f])
Signature · 1 line
2.34.1
PATCH 22/23 oeqa/selftest/prservice: Improve test robustness
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
The tests were not cleaning up after themselves and making assumptions about memory resident bitbake being stopped by the scripts.
Add cleanup logic to ensure the tests don't break other things and clean up created files.
--- meta/lib/oeqa/selftest/cases/prservice.py | 31 +++++++++++++++++------ 1 file changed, 23 insertions(+), 8 deletions(-)
meta/lib/oeqa/selftest/cases/prservice.py +23 -8
@@ -14,6 +14,8 @@ from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var from oeqa.utils.network import get_free_port +import bb.utils + class BitbakePrTests(OESelftestTestCase): @classmethod
@@ -21,6 +23,16 @@ class BitbakePrTests(OESelftestTestCase): super(BitbakePrTests, cls).setUpClass() cls.pkgdata_dir = get_bb_var('PKGDATA_DIR') + cls.exported_db_path = os.path.join(cls.builddir, 'export.inc') + cls.current_db_path = os.path.join(get_bb_var('PERSISTENT_DIR'), 'prserv.sqlite3') + + def cleanup(self): + # Ensure any memory resident bitbake is stopped + bitbake("-m") + # Remove any existing export file or prserv database + bb.utils.remove(self.exported_db_path) + bb.utils.remove(self.current_db_path + "*") + def get_pr_version(self, package_name): package_data_file = os.path.join(self.pkgdata_dir, 'runtime', package_name) package_data = ftools.read_file(package_data_file)
@@ -49,6 +61,7 @@ class BitbakePrTests(OESelftestTestCase): self.assertEqual(res.status, 0, msg=res.output) def config_pr_tests(self, package_name, package_type='rpm', pr_socket='localhost:0'): + self.cleanup() config_package_data = 'PACKAGE_CLASSES = "package_%s"' % package_type self.write_config(config_package_data) config_server_data = 'PRSERV_HOST = "%s"' % pr_socket
@@ -68,24 +81,24 @@ class BitbakePrTests(OESelftestTestCase): self.assertTrue(pr_2 - pr_1 == 1, "New PR %s did not increment as expected (from %s), difference should be 1" % (pr_2, pr_1)) self.assertTrue(stamp_1 != stamp_2, "Different pkg rev. but same stamp: %s" % stamp_1) + self.cleanup() + def run_test_pr_export_import(self, package_name, replace_current_db=True): self.config_pr_tests(package_name) self.increment_package_pr(package_name) pr_1 = self.get_pr_version(package_name) - exported_db_path = os.path.join(self.builddir, 'export.inc') - export_result = runCmd("bitbake-prserv-tool export %s" % exported_db_path, ignore_status=True) + export_result = runCmd("bitbake-prserv-tool export %s" % self.exported_db_path, ignore_status=True) self.assertEqual(export_result.status, 0, msg="PR Service database export failed: %s" % export_result.output) - self.assertTrue(os.path.exists(exported_db_path), msg="%s didn't exist, tool output %s" % (exported_db_path, export_result.output)) + self.assertTrue(os.path.exists(self.exported_db_path), msg="%s didn't exist, tool output %s" % (self.exported_db_path, export_result.output)) if replace_current_db: - current_db_path = os.path.join(get_bb_var('PERSISTENT_DIR'), 'prserv.sqlite3') - self.assertTrue(os.path.exists(current_db_path), msg="Path to current PR Service database is invalid: %s" % current_db_path) - os.remove(current_db_path) + self.assertTrue(os.path.exists(self.current_db_path), msg="Path to current PR Service database is invalid: %s" % self.current_db_path) + os.remove(self.current_db_path) - import_result = runCmd("bitbake-prserv-tool import %s" % exported_db_path, ignore_status=True) - os.remove(exported_db_path) + import_result = runCmd("bitbake-prserv-tool import %s" % self.exported_db_path, ignore_status=True) + #os.remove(self.exported_db_path) self.assertEqual(import_result.status, 0, msg="PR Service database import failed: %s" % import_result.output) self.increment_package_pr(package_name)
@@ -93,6 +106,8 @@ class BitbakePrTests(OESelftestTestCase): self.assertTrue(pr_2 - pr_1 == 1, "New PR %s did not increment as expected (from %s), difference should be 1" % (pr_2, pr_1)) + self.cleanup() + def test_import_export_replace_db(self): self.run_test_pr_export_import('m4')
Signature · 1 line
2.34.1
PATCH 23/23 package.py: OEHasPackage: Add MLPREFIX to packagename
In reply to Steve SakomanFrom: Saul Wold <[email protected]>
FIXES [YOCTO #12342]
When testing a Multilib image, the package manifest list contains the fully qualified package name which includes the Multilib Prefix. This patch adds the MLPREFIX to the package names that are passed into the @OEHasPackage() decorator to ensure the set isdisjoint() matches correctly.
--- meta/lib/oeqa/runtime/decorator/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/decorator/package.py +3 -2
@@ -38,11 +38,12 @@ class OEHasPackage(OETestDecorator): if isinstance(self.need_pkgs, str): self.need_pkgs = [self.need_pkgs,] + mlprefix = self.case.td.get("MLPREFIX") for pkg in self.need_pkgs: if pkg.startswith('!'): - unneed_pkgs.add(pkg[1:]) + unneed_pkgs.add(mlprefix + pkg[1:]) else: - need_pkgs.add(pkg) + need_pkgs.add(mlprefix + pkg) if unneed_pkgs: msg = 'Checking if %s is not installed' % ', '.join(unneed_pkgs)
Signature · 1 line
2.34.1