Patch review
cover Patch review
Please review this set of changes for mickledore and have comments back by end of day Monday.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5657
The following changes since commit 4724b382d183a2b3b8426c77c23b368f509411e7:
acpica: Update SRC_URI (2023-07-21 07:41:18 -1000)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/mickledore-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/mickledore-nut
Benjamin Bouvier (1):
util-linux: add alternative links for ipcs,ipcrm
Bruce Ashfield (3):
linux-yocto/6.1: update to v6.1.36
linux-yocto/6.1: update to v6.1.37
linux-yocto/6.1: update to v6.1.38
Jose Quaresma (3):
kernel-module-split add systemd modulesloaddir and modprobedir config
openssl: add PERLEXTERNAL path to test its existence
openssl: use a glob on the PERLEXTERNAL to track updates on the path
Khem Raj (1):
meson.bbclass: Point to llvm-config from native sysroot
Mingli Yu (2):
cups: Fix CVE-2023-34241
ruby: Fix CVE-2023-36617
Ovidiu Panait (5):
mdadm: fix util-linux ptest dependency
mdadm: fix 07revert-inplace ptest
mdadm: fix segfaults when running ptests
mdadm: skip running known broken ptests
mdadm: re-add mdadm-ptest to PTESTS_SLOW
Peter Marko (2):
libjpeg-turbo: patch CVE-2023-2804
python3: ignore CVE-2023-36632
Quentin Schulz (1):
uboot-extlinux-config.bbclass: fix old override syntax in comment
Ross Burton (4):
pkgconf: update SRC_URI
python3: fix missing comma in get_module_deps3.py oeqa/runtime/cases/rpm: fix wait_for_no_process_for_user failure case
rootfs_rpm: don't depend on opkg-native for update-alternatives
Stéphane Veyret (1):
scripts/oe-setup-builddir: copy conf-notes.txt to build dir
Wang Mingyu (2):
taglib: upgrade 1.13 -> 1.13.1
libwebp: upgrade 1.3.0 -> 1.3.1
Yoann Congal (1):
oeqa/selftest/devtool: add unit test for "devtool add -b"
Yuta Hayama (1):
systemd-systemctl: fix errors in instance name expansion
.../kernel-module-split.bbclass | 4 +-
meta/classes-recipe/meson.bbclass | 1 +
meta/classes-recipe/rootfs_rpm.bbclass | 4 +-
.../uboot-extlinux-config.bbclass | 8 +-
.../distro/include/ptest-packagelists.inc | 3 +-
meta/lib/oeqa/runtime/cases/rpm.py | 4 +-
meta/lib/oeqa/selftest/cases/devtool.py | 32 ++
.../openssl/openssl_3.1.1.bb | 4 +-
meta/recipes-core/images/core-image-ptest.bb | 1 +
.../systemd/systemd-systemctl/systemctl | 2 +-
.../util-linux/util-linux_2.38.1.bb | 2 +
.../recipes-devtools/pkgconf/pkgconf_1.9.5.bb | 2 +-
.../python/python3/get_module_deps3.py | 2 +-
.../recipes-devtools/python/python3_3.11.2.bb | 2 +
.../ruby/ruby/CVE-2023-36617_1.patch | 56 +++
.../ruby/ruby/CVE-2023-36617_2.patch | 52 ++
meta/recipes-devtools/ruby/ruby_3.2.2.bb | 2 +
meta/recipes-extended/cups/cups.inc | 1 +
.../cups/cups/CVE-2023-34241.patch | 70 +++
...anup-validate_geometry_ddf_container.patch | 148 ++++++
...nter-dereference-in-validate_geometr.patch | 56 +++
...se-after-close-bug-by-closing-after-.patch | 91 ++++
...gfault-when-calling-NULL-get_bad_blo.patch | 42 ++
...Mark-and-ignore-broken-test-failures.patch | 128 +++++
...dd-broken-files-for-all-broken-tests.patch | 454 ++++++++++++++++++
meta/recipes-extended/mdadm/files/run-ptest | 2 +-
meta/recipes-extended/mdadm/mdadm_4.2.bb | 9 +-
.../jpeg/files/CVE-2023-2804-1.patch | 103 ++++
.../jpeg/files/CVE-2023-2804-2.patch | 75 +++
.../jpeg/libjpeg-turbo_2.1.5.1.bb | 2 +
.../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 +-
.../webp/files/CVE-2023-1999.patch | 55 ---
.../{libwebp_1.3.0.bb => libwebp_1.3.1.bb} | 6 +-
.../{taglib_1.13.bb => taglib_1.13.1.bb} | 2 +-
scripts/oe-setup-builddir | 14 +-
37 files changed, 1373 insertions(+), 106 deletions(-)
create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch
create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch
create mode 100644 meta/recipes-extended/cups/cups/CVE-2023-34241.patch
create mode 100644 meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch
create mode 100644 meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch
create mode 100644 meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch
create mode 100644 meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch
create mode 100644 meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch
create mode 100644 meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch
create mode 100644 meta/recipes-graphics/jpeg/files/CVE-2023-2804-1.patch
create mode 100644 meta/recipes-graphics/jpeg/files/CVE-2023-2804-2.patch
delete mode 100644 meta/recipes-multimedia/webp/files/CVE-2023-1999.patch
rename meta/recipes-multimedia/webp/{libwebp_1.3.0.bb => libwebp_1.3.1.bb} (93%)
rename meta/recipes-support/taglib/{taglib_1.13.bb => taglib_1.13.1.bb} (95%)Signature · 1 line
2.34.1
PATCH 1/27 libjpeg-turbo: patch CVE-2023-2804
From: Peter Marko <[email protected]>
Relevant links:
* linked fronm NVD:
* https://github.com/libjpeg-turbo/libjpeg-turbo/issues/668#issuecomment-1492586118
* follow-up analysis:
* https://github.com/libjpeg-turbo/libjpeg-turbo/issues/668#issuecomment-1496473989
* picked commits fix all issues mentioned in this analysis
--- .../jpeg/files/CVE-2023-2804-1.patch | 103 ++++++++++++++++++ .../jpeg/files/CVE-2023-2804-2.patch | 75 +++++++++++++ .../jpeg/libjpeg-turbo_2.1.5.1.bb | 2 + 3 files changed, 180 insertions(+) create mode 100644 meta/recipes-graphics/jpeg/files/CVE-2023-2804-1.patch create mode 100644 meta/recipes-graphics/jpeg/files/CVE-2023-2804-2.patch
meta/recipes-graphics/jpeg/files/CVE-2023-2804-1.patch new file +103 -0
@@ -0,0 +1,103 @@ +From 42ce199c9cfe129e5e21afd48dfe757a6acf87c4 Mon Sep 17 00:00:00 2001 +From: DRC <[email protected]> +Date: Tue, 4 Apr 2023 19:06:20 -0500 +Subject: [PATCH] Decomp: Don't enable 2-pass color quant w/ RGB565 + +The 2-pass color quantization algorithm assumes 3-sample pixels. RGB565 +is the only 3-component colorspace that doesn't have 3-sample pixels, so +we need to treat it as a special case when determining whether to enable +2-pass color quantization. Otherwise, attempting to initialize 2-pass +color quantization with an RGB565 output buffer could cause +prescan_quantize() to read from uninitialized memory and subsequently +underflow/overflow the histogram array. + +djpeg is supposed to fail gracefully if both -rgb565 and -colors are +specified, because none of its destination managers (image writers) +support color quantization with RGB565. However, prescan_quantize() was +called before that could occur. It is possible but very unlikely that +these issues could have been reproduced in applications other than +djpeg. The issues involve the use of two features (12-bit precision and +RGB565) that are incompatible, and they also involve the use of two +rarely-used legacy features (RGB565 and color quantization) that don't +make much sense when combined. + +Fixes #668 +Fixes #671 +Fixes #680 + +CVE: CVE-2023-2804 +Upstream-Status: Backport [https://github.com/libjpeg-turbo/libjpeg-turbo/commit/42ce199c9cfe129e5e21afd48dfe757a6acf87c4] + +Signed-off-by: Peter Marko <[email protected]> +--- + ChangeLog.md | 12 ++++++++++++ + jdmaster.c | 5 +++-- + jquant2.c | 5 +++-- + 3 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/ChangeLog.md b/ChangeLog.md +index 1c1e6538a..f1bfb3d87 100644 +--- a/ChangeLog.md ++++ b/ChangeLog.md +@@ -1,3 +1,15 @@ ++2.1.6 ++===== ++ ++### Significant changes relative to 2.1.5.1: ++ ++1. Fixed an oversight in 1.4 beta1[8] that caused various segfaults and buffer ++overruns when attempting to decompress various specially-crafted malformed ++12-bit-per-component JPEG images using a 12-bit-per-component build of djpeg ++(`-DWITH_12BIT=1`) with both color quantization and RGB565 color conversion ++enabled. ++ ++ + 2.1.5.1 + ======= + +diff --git a/jdmaster.c b/jdmaster.c +index a3690bf56..a9446adfd 100644 +--- a/jdmaster.c ++++ b/jdmaster.c +@@ -5,7 +5,7 @@ + * Copyright (C) 1991-1997, Thomas G. Lane. + * Modified 2002-2009 by Guido Vollbeding. + * libjpeg-turbo Modifications: +- * Copyright (C) 2009-2011, 2016, 2019, 2022, D. R. Commander. ++ * Copyright (C) 2009-2011, 2016, 2019, 2022-2023, D. R. Commander. + * Copyright (C) 2013, Linaro Limited. + * Copyright (C) 2015, Google, Inc. + * For conditions of distribution and use, see the accompanying README.ijg +@@ -480,7 +480,8 @@ master_selection(j_decompress_ptr cinfo) + if (cinfo->raw_data_out) + ERREXIT(cinfo, JERR_NOTIMPL); + /* 2-pass quantizer only works in 3-component color space. */ +- if (cinfo->out_color_components != 3) { ++ if (cinfo->out_color_components != 3 || ++ cinfo->out_color_space == JCS_RGB565) { + cinfo->enable_1pass_quant = TRUE; + cinfo->enable_external_quant = FALSE; + cinfo->enable_2pass_quant = FALSE; +diff --git a/jquant2.c b/jquant2.c +index 44efb18ca..1c14ef763 100644 +--- a/jquant2.c ++++ b/jquant2.c +@@ -4,7 +4,7 @@ + * This file was part of the Independent JPEG Group's software: + * Copyright (C) 1991-1996, Thomas G. Lane. + * libjpeg-turbo Modifications: +- * Copyright (C) 2009, 2014-2015, 2020, D. R. Commander. ++ * Copyright (C) 2009, 2014-2015, 2020, 2023, D. R. Commander. + * For conditions of distribution and use, see the accompanying README.ijg + * file. + * +@@ -1230,7 +1230,8 @@ jinit_2pass_quantizer(j_decompress_ptr cinfo) + cquantize->error_limiter = NULL; + + /* Make sure jdmaster didn't give me a case I can't handle */ +- if (cinfo->out_color_components != 3) ++ if (cinfo->out_color_components != 3 || ++ cinfo->out_color_space == JCS_RGB565) + ERREXIT(cinfo, JERR_NOTIMPL); + + /* Allocate the histogram/inverse colormap storage */
meta/recipes-graphics/jpeg/files/CVE-2023-2804-2.patch new file +75 -0
75 lines not on this page · raw message
meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb +2 -0
@@ -12,6 +12,8 @@ DEPENDS:append:x86:class-target = " nasm-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0001-libjpeg-turbo-fix-package_qa-error.patch \ + file://CVE-2023-2804-1.patch \ + file://CVE-2023-2804-2.patch \ " SRC_URI[sha256sum] = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf"
Signature · 1 line
2.34.1
PATCH 2/27 python3: ignore CVE-2023-36632
In reply to Steve SakomanFrom: Peter Marko <[email protected]>
This CVE shouldn't have been filed as the "exploit" is described in the documentation as how the library behaves.
--- meta/recipes-devtools/python/python3_3.11.2.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/python/python3_3.11.2.bb +2 -0
@@ -56,6 +56,8 @@ CVE_CHECK_IGNORE += "CVE-2020-15523 CVE-2022-26488" # The mailcap module is insecure by design, so this can't be fixed in a meaningful way. # The module will be removed in the future and flaws documented. CVE_CHECK_IGNORE += "CVE-2015-20107" +# Not an issue, in fact expected behaviour +CVE_CHECK_IGNORE += "CVE-2023-36632" PYTHON_MAJMIN = "3.11"
Signature · 1 line
2.34.1
PATCH 3/27 cups: Fix CVE-2023-34241
In reply to Steve SakomanFrom: Mingli Yu <[email protected]>
Backport patch [1] to fix CVE-2023-34241.
[1] https://github.com/OpenPrinting/cups/commit/9809947a959e18409dcf562a3466ef246cb90cb2
--- meta/recipes-extended/cups/cups.inc | 1 + .../cups/cups/CVE-2023-34241.patch | 70 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/CVE-2023-34241.patch
meta/recipes-extended/cups/cups.inc +1 -0
@@ -16,6 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/cups-${PV}-source.tar.gz \ file://volatiles.99_cups \ file://cups-volatiles.conf \ file://CVE-2023-32324.patch \ + file://CVE-2023-34241.patch \ " GITHUB_BASE_URI = "https://github.com/OpenPrinting/cups/releases"
meta/recipes-extended/cups/cups/CVE-2023-34241.patch new file +70 -0
70 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 4/27 ruby: Fix CVE-2023-36617
In reply to Steve SakomanFrom: Mingli Yu <[email protected]>
Backport two patches [1] [2] to fix CVE-2023-36617 [3].
[1] https://github.com/ruby/uri/commit/9010ee2536adda10a0555ae1ed6fe2f5808e6bf1
[2] https://github.com/ruby/uri/commit/9d7bcef1e6ad23c9c6e4932f297fb737888144c8
[3] https://www.ruby-lang.org/en/news/2023/06/29/redos-in-uri-CVE-2023-36617/
--- .../ruby/ruby/CVE-2023-36617_1.patch | 56 +++++++++++++++++++ .../ruby/ruby/CVE-2023-36617_2.patch | 52 +++++++++++++++++ meta/recipes-devtools/ruby/ruby_3.2.2.bb | 2 + 3 files changed, 110 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch
meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch new file +56 -0
@@ -0,0 +1,56 @@ +From 2ebb50d2dc302917a6f57c1239dc9e700dfe0e34 Mon Sep 17 00:00:00 2001 +From: Nobuyoshi Nakada <[email protected]> +Date: Thu, 27 Jul 2023 15:53:01 +0800 +Subject: [PATCH] Fix quadratic backtracking on invalid relative URI + +https://hackerone.com/reports/1958260 + +CVE: CVE-2023-36617 + +Upstream-Status: Backport [https://github.com/ruby/uri/commit/9010ee2536adda10a0555ae1ed6fe2f5808e6bf1] + +Signed-off-by: Mingli Yu <[email protected]> +--- + lib/uri/rfc2396_parser.rb | 4 ++-- + test/uri/test_parser.rb | 12 ++++++++++++ + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/lib/uri/rfc2396_parser.rb b/lib/uri/rfc2396_parser.rb +index 76a8f99..00c66cf 100644 +--- a/lib/uri/rfc2396_parser.rb ++++ b/lib/uri/rfc2396_parser.rb +@@ -497,8 +497,8 @@ module URI + ret = {} + + # for URI::split +- ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED) +- ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED) ++ ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED) ++ ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED) + + # for URI::extract + ret[:URI_REF] = Regexp.new(pattern[:URI_REF]) +diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb +index 72fb590..721e05e 100644 +--- a/test/uri/test_parser.rb ++++ b/test/uri/test_parser.rb +@@ -79,4 +79,16 @@ class URI::TestParser < Test::Unit::TestCase + assert_equal([nil, nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("//example.com")) + assert_equal([nil, nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("//[0::0]")) + end ++ ++ def test_rfc2822_parse_relative_uri ++ pre = ->(length) { ++ " " * length + "\0" ++ } ++ parser = URI::RFC2396_Parser.new ++ assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |uri| ++ assert_raise(URI::InvalidURIError) do ++ parser.split(uri) ++ end ++ end ++ end + end +-- +2.25.1 +
meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch new file +52 -0
52 lines not on this page · raw message
meta/recipes-devtools/ruby/ruby_3.2.2.bb +2 -0
@@ -31,6 +31,8 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ file://0006-Make-gemspecs-reproducible.patch \ file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ file://0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch \ + file://CVE-2023-36617_1.patch \ + file://CVE-2023-36617_2.patch \ " UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
Signature · 1 line
2.34.1
PATCH 5/27 linux-yocto/6.1: update to v6.1.36
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating to the latest korg -stable release that comprises the following commits:
a1c449d00ff8 Linux 6.1.36
29429a1f5871 smb: move client and server files to common directory fs/smb
9d3e4bca4b92 i2c: imx-lpi2c: fix type char overflow issue when calculating the clock cycle 81d4078f7a42 x86/apic: Fix kernel panic when booting with intremap=off and x2apic_phys 679354bea008 KVM: arm64: Restore GICv2-on-GICv3 functionality
6ab9468d3eea vhost_net: revert upend_idx only on retriable error
454e4f391a14 vhost_vdpa: tell vqs about the negotiated
1af1cd7be370 drm/radeon: fix race condition UAF in radeon_gem_set_domain_ioctl 022f2306d94f drm/exynos: fix race condition UAF in exynos_g2d_exec_ioctl
aa88042218aa drm/exynos: vidi: fix a wrong error return
711f727f7bab null_blk: Fix: memory release when memory_backed=1
f6076a1386c9 ARM: dts: Fix erroneous ADS touchscreen polarities
1d1baefacdb4 i2c: mchp-pci1xxxx: Avoid cast to incompatible function type
8e3257599409 ALSA: hda/realtek: Add "Intel Reference board" and "NUC 13" SSID in the ALC256 cfa01235b5ed ASoC: fsl_sai: Enable BCI bit if SAI works on synchronous mode with BYP asserted 570583c6251a s390/purgatory: disable branch profiling
c2888c460db2 gfs2: Don't get stuck writing page onto itself under direct I/O 878dad66b9b5 ASoC: amd: yc: Add Thinkpad Neo14 to quirks list for acp6x
1c97025d441f ASoC: nau8824: Add quirk to active-high jack-detect
5cc506e9b3e5 soundwire: qcom: add proper error paths in qcom_swrm_startup() 2839e0b64e65 soundwire: dmi-quirks: add new mapping for HP Spectre x360
ee4d36a14d3f ASoC: simple-card: Add missing of_node_put() in case of error
e701fb0a5d5b ASoC: codecs: wcd938x-sdw: do not set can_multi_write flag
06b9522ca831 spi: lpspi: disable lpspi module irq in DMA mode
39a77f005f8a s390/cio: unregister device when the only path is gone
552a24eb7168 arm64: dts: qcom: sc7280-qcard: drop incorrect dai-cells from WCD938x SDW 4de58b7c14c0 arm64: dts: qcom: sc7280-idp: drop incorrect dai-cells from WCD938x SDW 2e8ebf1a44cb Input: soc_button_array - add invalid acpi_index DMI quirk handling ba0cc7a2e508 nvme: improve handling of long keep alives
06d9ec407f76 nvme: check IO start time when deciding to defer KA
8a72260619ca nvme: double KA polling frequency to avoid KATO with TBKAS on
c8f988c37a6b usb: gadget: udc: fix NULL dereference in remove()
3f6391062d0b btrfs: fix an uninitialized variable warning in btrfs_log_inode a2c3e9bfc02c nfcsim.c: Fix error checking for debugfs_create_dir
a05df0643120 media: cec: core: don't set last_initiator if tx in progress
f37956a140d1 media: cec: core: disable adapter in cec_devnode_unregister
9d8ac2726cff smb3: missing null check in SMB2_change_notify
3e8458c5b205 arm64: Add missing Set/Way CMO encodings
8428f4c00d8c HID: wacom: Add error check to wacom_parse_and_register()
aaa50510adb7 scsi: target: iscsi: Prevent login threads from racing between each other 0357259cb103 gpiolib: Fix irq_domain resource tracking for gpiochip_irqchip_add_domain() 8592ada80ea5 gpio: sifive: add missing check for platform_get_irq
cb1108e17493 gpiolib: Fix GPIO chip IRQ initialization restriction
90714f7ed760 arm64: dts: rockchip: fix nEXTRST on SOQuartz
e51abd4808f9 arm64: dts: rockchip: Enable GPU on SOQuartz CM4
ec3d0f12e728 revert "net: align SO_RCVMARK required privileges with SO_MARK" b2e2f9c0939f sch_netem: acquire qdisc lock in netem_change()
0434277b72a4 platform/x86/amd/pmf: Register notify handler only if SPS is enabled 2d580c73afdc selftests: forwarding: Fix race condition in mirror installation eff07bf11841 io_uring/net: use the correct msghdr union member in io_sendmsg_copy_hdr 1b7b048c228e bpf: Force kprobe multi expected_attach_type for kprobe_multi link fc3afb337814 bpf/btf: Accept function names that contain dots
22cc989f2b10 Revert "net: phy: dp83867: perform soft reset and retain established link" 3e04743dbacf netfilter: nfnetlink_osf: fix module autoload
abd3afddbf9e netfilter: nf_tables: disallow updates of anonymous sets
c34b22038543 netfilter: nf_tables: reject unbound chain set before commit phase 46f801ab5fb9 netfilter: nf_tables: reject unbound anonymous set before commit phase b60c0ce0ff31 netfilter: nf_tables: disallow element updates of bound anonymous sets 0d836f917520 netfilter: nft_set_pipapo: .walk does not deal with generations d60be2da67d1 netfilter: nf_tables: drop map element references from preparation phase df27be7c1530 netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain 891cd2edddc7 netfilter: nf_tables: fix chain binding transaction logic
f5b6dbec26f1 be2net: Extend xmit workaround to BE3 chip
50f689918db4 net: dsa: mt7530: fix handling of LLDP frames
a50f84af215e net: dsa: mt7530: fix handling of BPDUs on MT7530 switch
a4e4c7190126 net: dsa: mt7530: fix trapping frames on non-MT7621 SoC MT7530 switch 7fd2e9a69e83 ipvs: align inner_mac_header for encapsulation
6d1eec1f2dd7 mmc: usdhi60rol0: fix deferred probing
7e10fff13353 mmc: sh_mmcif: fix deferred probing
565b8bd2905d mmc: sdhci-acpi: fix deferred probing
645f89ee3e3e mmc: owl: fix deferred probing
251101c32a01 mmc: omap_hsmmc: fix deferred probing
0057a905de5c mmc: omap: fix deferred probing
f73b380518b2 mmc: mvsdio: fix deferred probing
4806f6b6b7a3 mmc: mtk-sd: fix deferred probing
d28b7a87332f net: qca_spi: Avoid high load if QCA7000 is not available
1d4dd09f13a9 sfc: use budget for TX completions
0bbb8164ed07 net/mlx5: DR, Fix wrong action data allocation in decap action b062caf4f73b xfrm: Linearize the skb after offloading if needed.
fff9a18e0128 selftests: net: fcnal-test: check if FIPS mode is enabled
0793ead2ff2c selftests: net: vrf-xfrm-tests: change authentication and encryption algos 6919634176cd selftests: net: tls: check if FIPS mode is enabled
ac5671d10060 bpf: Fix a bpf_jit_dump issue for x86_64 with sysctl bpf_jit_enable. 8bb51cdc4fc2 xfrm: fix inbound ipv4/udp/esp packets to UDPv6 dualstack sockets d9a0b1a53c79 bpf: Fix verifier id tracking of scalars on spill
461fc3391c52 bpf: track immediate values written to stack by BPF_ST instruction b36ba84f09a1 KVM: arm64: PMU: Restore the host's PMUSERENR_EL0
c803e91600be xfrm: Ensure policies always checked on XFRM-I input path
94e81817f080 xfrm: interface: rename xfrm_interface.c to xfrm_interface_core.c 8ea03341f78a xfrm: Treat already-verified secpath entries as optional
43489b2cba5a ieee802154: hwsim: Fix possible memory leaks
caddcdf2a999 mmc: meson-gx: fix deferred probing
1a2793a25a60 memfd: check for non-NULL file_seals in memfd_create() syscall 364fdcbb035b x86/mm: Avoid using set_pgd() outside of real PGD pages
cbfee3d9d5c0 nilfs2: prevent general protection fault in nilfs_clear_dirty_page() 24f473769e7e io_uring/poll: serialize poll linked timer start with poll removal 2d80c85fa404 arm64: dts: rockchip: Fix rk356x PCIe register and range mappings 277a7c23b590 regmap: spi-avmm: Fix regmap_bus max_raw_write
b385b1d28e4e regulator: pca9450: Fix LDO3OUT and LDO4OUT MASK
ad5daeaa3d57 spi: spi-geni-qcom: correctly handle -EPROBE_DEFER from dma_request_chan() 21945b7a868f wifi: iwlwifi: pcie: Handle SO-F device for PCI id 0x7AF0
1dfca388fc7c bpf: ensure main program has an extable
03b2149d5aca mmc: sunxi: fix deferred probing
8b8756324c5b mmc: bcm2835: fix deferred probing
1db5a39a904e mmc: sdhci-spear: fix deferred probing
f1b17198e45b mmc: mmci: stm32: fix max busy timeout calculation
6c2af0fd8301 mmc: meson-gx: remove redundant mmc_request_done() call from irq context 687d34c57807 mmc: sdhci-msm: Disable broken 64-bit DMA on MSM8916
3dd0041c41da mmc: litex_mmc: set PROBE_PREFER_ASYNCHRONOUS
0d7a4e6589a0 cgroup,freezer: hold cpu_hotplug_lock before freezer_mutex in freezer_css_{online,offline}() 7b162a18d332 cgroup: Do not corrupt task iteration when rebinding subsystem c2c46a70282f mptcp: consolidate fallback and non fallback state machine
1d3127542665 mptcp: fix possible list corruption on passive MPJ
b747e755986a mptcp: fix possible divide by zero in recvmsg()
b7bb71dfb541 mptcp: handle correctly disconnect() failures
1d9dc9bed999 io_uring/net: disable partial retries for recvmsg with cmsg
4d729cc67b05 io_uring/net: clear msg_controllen on partial sendmsg retry
4db49d59a89c PCI: hv: Add a per-bus mutex state_lock
091d03d19859 PCI: hv: Fix a race condition in hv_irq_unmask() that can cause panic 5c09925b1879 PCI: hv: Remove the useless hv_pcichild_state from struct hv_pci_dev da2fff20d92d Revert "PCI: hv: Fix a timing issue which causes kdump to fail occasionally" a74a9d9b756a PCI: hv: Fix a race condition bug in hv_pci_query_relations()
ba803d7ac18a Drivers: hv: vmbus: Fix vmbus_wait_for_unload() to scan present CPUs 191cb913293a Drivers: hv: vmbus: Call hv_synic_free() if hv_synic_alloc() fails 4f7e702b74f7 KVM: Avoid illegal stage2 mapping on invalid memory slot
390aeb5ae7c0 ACPI: sleep: Avoid breaking S3 wakeup due to might_sleep()
8e63b1fd24a8 nilfs2: fix buffer corruption due to concurrent device reads
d5d7cde2ad19 scripts: fix the gfp flags header path in gfp-translate
4a89bfb1a142 writeback: fix dereferencing NULL mapping->host on writeback_page_template 1fed1f851346 selftests: mptcp: join: fix "userspace pm add & remove address" 53e096bcaeac selftests: mptcp: join: skip fail tests if not supported
f17459121c37 selftests: mptcp: join: skip userspace PM tests if not supported f40a7ded34c9 selftests: mptcp: join: skip test if iptables/tc cmds fail
bce23d125434 selftests: mptcp: sockopt: skip TCP_INQ checks if not supported 157dcb20000b selftests: mptcp: diag: skip listen tests if not supported
755c8857abde selftests/mount_setattr: fix redefine struct mount_attr build error 94851666aff4 selftests: mptcp: join: skip MPC backups tests if not supported fe1f28db73f7 selftests: mptcp: join: skip fullmesh flag tests if not supported 6313c493e3c9 selftests: mptcp: join: skip backup if set flag on ID not supported efb4f6c2dd4c selftests: mptcp: join: skip implicit tests if not supported
dd6c284a3430 selftests: mptcp: join: support RM_ADDR for used endpoints or not 695cce2f2cf5 selftests: mptcp: join: skip Fastclose tests if not supported
0381f30735e2 selftests: mptcp: join: support local endpoint being tracked or not 1c0d9b4b4745 selftests: mptcp: join: skip check if MIB counter not supported e35edb09e53e selftests: mptcp: join: helpers to skip tests
4d65ec947d24 selftests: mptcp: join: use 'iptables-legacy' if available
44d3366bf4b9 selftests: mptcp: lib: skip if not below kernel version
c5bdd8eb8e7d selftests: mptcp: userspace pm: skip if not supported
733bf9d80d95 selftests: mptcp: userspace pm: skip if 'ip' tool is unavailable bfe225dec643 selftests: mptcp: sockopt: skip getsockopt checks if not supported 103b4e62de32 selftests: mptcp: sockopt: relax expected returned size
61c1bf0666a9 selftests: mptcp: pm nl: skip fullmesh flag checks if not supported 41f7f7f6e43e selftests: mptcp: pm nl: remove hardcoded default limits
e79e5e7642ad selftests: mptcp: connect: skip disconnect tests if not supported cba0db9c1586 selftests: mptcp: connect: skip transp tests if not supported
9ead68270b29 selftests: mptcp: lib: skip if missing symbol
4bed22c6876b selftests: mptcp: join: fix ShellCheck warnings
a032ccca15e1 selftests: mptcp: remove duplicated entries in usage
0c6552f83725 tick/common: Align tick period during sched_timer setup
854156d12caa ksmbd: validate session id and tree id in the compound request c86211159bc3 ksmbd: fix out-of-bound read in smb2_write
9650cf70ec9d ksmbd: validate command payload size
0fd4ac3773c3 tpm_crb: Add support for CRB devices based on Pluton
a46fa5696613 tpm, tpm_tis: Claim locality in interrupt handler
2e7ad879e1b0 mm: Fix copy_from_user_nofault().
4ed740c6482f ata: libata-scsi: Avoid deadlock on rescan after device resume c4465bff4d2f tty: serial: fsl_lpuart: reduce RX watermark to 0 on LS1028A
17732fed852a tty: serial: fsl_lpuart: make rx_watermark configurable for different platforms 9bcac453890b drm/amd/display: fix the system hang while disable PSR
e538342002cb drm/amd/display: Add wrapper to call planes and stream update
8d855bc67630 drm/amd/display: Use dc_update_planes_and_stream
--- .../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 ?= "6f370bf9127713eccdfb3cf009c46ef4852aec28" -SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e" +SRCREV_machine ?= "5227a8173cee7256e370750216dbff5eca741134" +SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" 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.35" +LINUX_VERSION ?= "6.1.36" 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.35" +LINUX_VERSION ?= "6.1.36" 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 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e" +SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_6.1.bb +14 -14
@@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "915f4d2237d1c8e23eb67eda0b8e9b24373a80b4" -SRCREV_machine:qemuarm64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemuloongarch64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemumips ?= "1aad3fa2eba5594fb4e779fc53fef6046d833c91" -SRCREV_machine:qemuppc ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemuriscv64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemuriscv32 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemux86 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemux86-64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemumips64 ?= "53e7685d6da27e112397e71c27a0bce0fc9313a9" -SRCREV_machine ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e" +SRCREV_machine:qemuarm ?= "5dd09d311b31db8c7b098e14a7857ef8a6e5353d" +SRCREV_machine:qemuarm64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemuloongarch64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemumips ?= "1d79865ce12928b85ab2ab1756e7aa7ae5cc4938" +SRCREV_machine:qemuppc ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemuriscv64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemuriscv32 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemux86 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemux86-64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemumips64 ?= "7241bd2e494f07582f736ef1604e81ccd4afc7cf" +SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" # 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 ?= "e84a4e368abe42cf359fe237f0238820859d5044" +SRCREV_machine:class-devupstream ?= "a1c449d00ff8ce2c5fcea5f755df682d1f6bc2ef" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base"
@@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.35" +LINUX_VERSION ?= "6.1.36" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.34.1
PATCH 6/27 linux-yocto/6.1: update to v6.1.37
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating to the latest korg -stable release that comprises the following commits:
0f4ac6b4c5f0 Linux 6.1.37
323846590c55 xtensa: fix NOMMU build with lock_mm_and_find_vma() conversion
c2d89256de75 csky: fix up lock_mm_and_find_vma() conversion
4a1db15878aa parisc: fix expand_stack() conversion
0a1da2dde461 sparc32: fix lock_mm_and_find_vma() conversion
00f04a3385f7 Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe" a536383ef030 HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651.
d89750b19681 HID: wacom: Use ktime_t rather than int when dealing with timestamps 879e79c3aead HID: hidraw: fix data race on device refcount
cae854249578 fbdev: fix potential OOB read in fast_imageblit()
e6bbad75712a mm: always expand the stack with the mmap write lock held
c4b31d1b694e execve: expand new process stack manually ahead of time
6a6b5616c3d0 mm: make find_extend_vma() fail if write lock not held
48c232819e77 powerpc/mm: convert coprocessor fault to lock_mm_and_find_vma()
21ee33d51bf9 mm/fault: convert remaining simple cases to lock_mm_and_find_vma() 1f4197f050de arm/mm: Convert to using lock_mm_and_find_vma()
ac764deea709 riscv/mm: Convert to using lock_mm_and_find_vma()
7227d70acc78 mips/mm: Convert to using lock_mm_and_find_vma()
82972ea17b47 powerpc/mm: Convert to using lock_mm_and_find_vma()
b92cd80e5f0b arm64/mm: Convert to using lock_mm_and_find_vma()
755aa1bc6aaf mm: make the page fault mmap locking killable
d6a5c7a1a6e5 mm: introduce new 'lock_mm_and_find_vma()' page fault helper
4e2ad53ababe maple_tree: fix potential out-of-bounds access in mas_wr_end_piv() 31cde3bdadca can: isotp: isotp_sendmsg(): fix return error fix on TX path
0af4750eaaed x86/smp: Cure kexec() vs. mwait_play_dead() breakage
6d3b2e0aef6c x86/smp: Use dedicated cache-line for mwait_play_dead()
50a1abc67702 x86/smp: Remove pointless wmb()s from native_stop_other_cpus()
e47037d28b73 x86/smp: Dont access non-existing CPUID leaf
edadebb349e8 x86/smp: Make stop_other_cpus() more robust
94a69d699941 x86/microcode/AMD: Load late on both threads too
84f077802e56 mm, hwpoison: when copy-on-write hits poison, take page offline
4af5960d7cd4 mm, hwpoison: try to recover from copy-on write faults
69925a346acb mptcp: ensure listener is unhashed before updating the sk status
42a018a796d1 mm/mmap: Fix error return in do_vmi_align_munmap()
a149174ff8bb mm/mmap: Fix error path in do_vmi_align_munmap()
--- .../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 ?= "5227a8173cee7256e370750216dbff5eca741134" -SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" +SRCREV_machine ?= "48cdae83316b7055b4e63f3434ea26b0c04d7c71" +SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" 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.36" +LINUX_VERSION ?= "6.1.37" 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.36" +LINUX_VERSION ?= "6.1.37" 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 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" +SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_6.1.bb +14 -14
@@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "5dd09d311b31db8c7b098e14a7857ef8a6e5353d" -SRCREV_machine:qemuarm64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemuloongarch64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemumips ?= "1d79865ce12928b85ab2ab1756e7aa7ae5cc4938" -SRCREV_machine:qemuppc ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemuriscv64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemuriscv32 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemux86 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemux86-64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemumips64 ?= "7241bd2e494f07582f736ef1604e81ccd4afc7cf" -SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" +SRCREV_machine:qemuarm ?= "fccbb53f81908991a69214e09ae0eea360410617" +SRCREV_machine:qemuarm64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemuloongarch64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemumips ?= "8370d3d4823bcff9532dd6bb163359f75a5416cd" +SRCREV_machine:qemuppc ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemuriscv64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemuriscv32 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemux86 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemux86-64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemumips64 ?= "efe0a0701a1a8c5b6113d6a06b65857f8c84ac9f" +SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" # 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 ?= "a1c449d00ff8ce2c5fcea5f755df682d1f6bc2ef" +SRCREV_machine:class-devupstream ?= "0f4ac6b4c5f00f45b7a429c8a5b028a598c6400c" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base"
@@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.36" +LINUX_VERSION ?= "6.1.37" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.34.1
PATCH 7/27 linux-yocto/6.1: update to v6.1.38
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating to the latest korg -stable release that comprises the following commits:
61fd484b2cf6 Linux 6.1.38
c50065a39279 drm/amd/display: Ensure vmin and vmax adjust for DCE 9d0b2afadfd7 drm/amdgpu: Validate VM ioctl flags.
fe56f507a11a docs: Set minimal gtags / GNU GLOBAL version to 6.6.5 c437b26bc3ae scripts/tags.sh: Resolve gtags empty index generation 50e36c2897ba perf symbols: Symbol lookup with kcore can fail if multiple segments match stext 67e3b5230cef nubus: Partially revert proc_create_single_data() conversion 296927dbae7d execve: always mark stack as growing down during early stack setup d856e6f8a0b4 PCI/ACPI: Call _REG when transitioning D-states
788c76c33df9 PCI/ACPI: Validate acpi_pci_set_power_state() parameter a905b0b318ad drm/amd/display: Do not update DRR while BW optimizations pending dd6d6f9d47ae drm/amd/display: Remove optimization for VRR updates 6b2849b3e05d xtensa: fix lock_mm_and_find_vma in case VMA not found
--- .../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 ?= "48cdae83316b7055b4e63f3434ea26b0c04d7c71" -SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" +SRCREV_machine ?= "efb2c857761e865cd7947aab42eaa5ba77ef6ee7" +SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" 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.37" +LINUX_VERSION ?= "6.1.38" 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.37" +LINUX_VERSION ?= "6.1.38" 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 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" +SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_6.1.bb +14 -14
@@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "fccbb53f81908991a69214e09ae0eea360410617" -SRCREV_machine:qemuarm64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemuloongarch64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemumips ?= "8370d3d4823bcff9532dd6bb163359f75a5416cd" -SRCREV_machine:qemuppc ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemuriscv64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemuriscv32 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemux86 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemux86-64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemumips64 ?= "efe0a0701a1a8c5b6113d6a06b65857f8c84ac9f" -SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" +SRCREV_machine:qemuarm ?= "a74344429a095a5941cd8dfac532160349344c92" +SRCREV_machine:qemuarm64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemuloongarch64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemumips ?= "78c81e178f8e2ffbb7c03cd324cf50ee0c5c4cf2" +SRCREV_machine:qemuppc ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemuriscv64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemuriscv32 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemux86 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemux86-64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemumips64 ?= "6c6b1170464e1f64f78a45cf7e78d5c678f38f48" +SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" # 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 ?= "0f4ac6b4c5f00f45b7a429c8a5b028a598c6400c" +SRCREV_machine:class-devupstream ?= "61fd484b2cf6bc8022e8e5ea6f693a9991740ac2" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base"
@@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.37" +LINUX_VERSION ?= "6.1.38" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.34.1
PATCH 8/27 taglib: upgrade 1.13 -> 1.13.1
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
Changelog:
===========
* Fixed parsing of TXXX frames without description.
* Detect MP4 atoms with invalid length or type.
* Do not miss ID3v2 frames when an extended header is present.
* Use property "DISCSUBTITLE" for ID3v2 "TSST" frame.
* Build system improvements: Use absolute path for macOS dylib install name, support --define-prefix when using pkg-config, fixed minimum required CppUnit version.
* Code clean up using clang-tidy.
---
.../recipes-support/taglib/{taglib_1.13.bb => taglib_1.13.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/taglib/{taglib_1.13.bb => taglib_1.13.1.bb} (95%)meta/recipes-support/taglib/taglib_1.13.1.bb renamed from meta/recipes-support/taglib/taglib_1.13.bb +1 -1
@@ -11,7 +11,7 @@ DEPENDS = "zlib" SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" -SRC_URI[sha256sum] = "58f08b4db3dc31ed152c04896ee9172d22052bc7ef12888028c01d8b1d60ade0" +SRC_URI[sha256sum] = "c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b" UPSTREAM_CHECK_URI = "https://taglib.org/"
Signature · 1 line
2.34.1
PATCH 9/27 libwebp: upgrade 1.3.0 -> 1.3.1
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
CVE-2023-1999.patch
removed since it's included in 1.3.1
Changelog:
==========
This is a binary compatible release.
* security fixes for lossless encoder (#603, chromium: #1420107, #1455619,
CVE-2023-1999)
* improve error reporting through WebPPicture error codes
* fix upsampling for RGB565 and RGBA4444 in NEON builds
* img2webp: add -sharp_yuv & -near_lossless
* Windows builds:
- fix compatibility with clang-cl (#607)
- improve Arm64 performance with cl.exe
- add Arm64EC support
* fix webp_js with emcc >= 3.1.27 (stack size change, #614)
* CMake fixes (#592, #610, #612)
* further updates to the container and lossless bitstream docs (#581, #611)
---
.../webp/files/CVE-2023-1999.patch | 55 -------------------
.../{libwebp_1.3.0.bb => libwebp_1.3.1.bb} | 6 +-
2 files changed, 1 insertion(+), 60 deletions(-)
delete mode 100644 meta/recipes-multimedia/webp/files/CVE-2023-1999.patch
rename meta/recipes-multimedia/webp/{libwebp_1.3.0.bb => libwebp_1.3.1.bb} (93%)meta/recipes-multimedia/webp/files/CVE-2023-1999.patch deleted +0 -55
@@ -1,55 +0,0 @@ -From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001 -From: James Zern <[email protected]> -Date: Wed, 22 Feb 2023 22:15:47 -0800 -Subject: [PATCH] EncodeAlphaInternal: clear result->bw on error - -This avoids a double free should the function fail prior to -VP8BitWriterInit() and a previous trial result's buffer carried over. -Previously in ApplyFiltersAndEncode() trial.bw (with a previous -iteration's buffer) would be freed, followed by best.bw pointing to the -same buffer. - -Since: -187d379d add a fallback to ALPHA_NO_COMPRESSION - -In addition, check the return value of VP8BitWriterInit() in this -function. - -Bug: webp:603 -Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910 - -CVE: CVE-2023-1999 -Upstream-Status: Backport [https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129] -Signed-off-by: Nikhil R <[email protected]> ---- - src/enc/alpha_enc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c -index f7c02690e3..7d205586fe 100644 ---- a/src/enc/alpha_enc.c -+++ b/src/enc/alpha_enc.c -@@ -13,6 +13,7 @@ - - #include <assert.h> - #include <stdlib.h> -+#include <string.h> - - #include "src/enc/vp8i_enc.h" - #include "src/dsp/dsp.h" -@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, - } - } else { - VP8LBitWriterWipeOut(&tmp_bw); -+ memset(&result->bw, 0, sizeof(result->bw)); - return 0; - } - } -@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, - header = method | (filter << 2); - if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4; - -- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size); -+ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0; - ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN); - ok = ok && VP8BitWriterAppend(&result->bw, output, output_size);
meta/recipes-multimedia/webp/libwebp_1.3.1.bb renamed from meta/recipes-multimedia/webp/libwebp_1.3.0.bb +1 -5
@@ -14,14 +14,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \ file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7" SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz" -SRC_URI[sha256sum] = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c" +SRC_URI[sha256sum] = "b3779627c2dfd31e3d8c4485962c2efe17785ef975e2be5c8c0c9e6cd3c4ef66" UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" -SRC_URI += " \ - file://CVE-2023-1999.patch \ -" - EXTRA_OECONF = " \ --disable-wic \ --enable-libwebpmux \
Signature · 1 line
2.34.1
PATCH 10/27 scripts/oe-setup-builddir: copy conf-notes.txt to build dir
In reply to Steve SakomanFrom: Stéphane Veyret <[email protected]>
Since commit 569d4cd325, if one is using a custom template directory containing a conf-notes.txt, this file is only displayed when creating a new environment. When entering an already existing environment, only the default poky conf-notes.txt is displayed.
This patch copies the conf-notes.txt to display to the build directory, so that the good file is shown, even when templateconf.cfg is not used.
--- scripts/oe-setup-builddir | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
scripts/oe-setup-builddir +9 -5
@@ -98,9 +98,17 @@ EOM SHOWYPDOC=yes fi +if [ -z "$OECORENOTESCONF" ]; then + OECORENOTESCONF="$OEROOT/meta/conf/templates/default/conf-notes.txt" +fi +if [ ! -r "$BUILDDIR/conf/conf-notes.txt" ]; then + [ ! -r "$OECORENOTESCONF" ] || cp "$OECORENOTESCONF" "$BUILDDIR/conf/conf-notes.txt" +fi + # Prevent disturbing a new GIT clone in same console unset OECORELOCALCONF unset OECORELAYERCONF +unset OECORENOTESCONF # Ending the first-time run message. Show the YP Documentation banner. if [ -n "$SHOWYPDOC" ]; then
@@ -116,11 +124,7 @@ EOM # unset SHOWYPDOC fi -if [ -z "$OECORENOTESCONF" ]; then - OECORENOTESCONF="$OEROOT/meta/conf/templates/default/conf-notes.txt" -fi -[ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" -unset OECORENOTESCONF +[ ! -r "$BUILDDIR/conf/conf-notes.txt" ] || cat "$BUILDDIR/conf/conf-notes.txt" if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg"
Signature · 1 line
2.34.1
PATCH 11/27 pkgconf: update SRC_URI
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
dereferenced.org is now longer controlled by the pkgconf maintainers[1], so use the the new hosting location.
[1] https://github.com/pkgconf/pkgconf/commit/437c2a3218bfcb1cae7fa38a4ccd0cb29575ff07
--- meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb +1 -1
@@ -15,7 +15,7 @@ LICENSE = "pkgconf" LIC_FILES_CHKSUM = "file://COPYING;md5=2214222ec1a820bd6cc75167a56925e0" SRC_URI = "\ - https://distfiles.dereferenced.org/pkgconf/pkgconf-${PV}.tar.xz \ + https://distfiles.ariadne.space/pkgconf/pkgconf-${PV}.tar.xz \ file://pkg-config-wrapper \ file://pkg-config-native.in \ file://pkg-config-esdk.in \
Signature · 1 line
2.34.1
PATCH 12/27 kernel-module-split add systemd modulesloaddir and modprobedir config
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
Because busybox doesn't support other path than /etc [1] we can't change the default path unconditionally so change it only for systemd.
The modules-load.d [2] - Configure kernel modules to load at boot should install their configuration files in /usr/lib/modules-load.d.
The modprobe.d [3] - Configuration directory for modprobe should install their configuration files in /lib/modprobe.d
[1] https://git.busybox.net/busybox/tree/modutils/modprobe.c?id=669c40ed8ebf480c95ce36135104e474e361a7e6#n658
[2] https://man7.org/linux/man-pages/man5/modules-load.d.5.html
[3] https://man7.org/linux/man-pages/man5/modprobe.d.5.html
[YOCTO #12212] https://bugzilla.yoctoproject.org/show_bug.cgi?id=12212
--- meta/classes-recipe/kernel-module-split.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes-recipe/kernel-module-split.bbclass +2 -2
@@ -30,8 +30,8 @@ fi PACKAGE_WRITE_DEPS += "kmod-native depmodwrapper-cross" -modulesloaddir ??= "${sysconfdir}/modules-load.d" -modprobedir ??= "${sysconfdir}/modprobe.d" +modulesloaddir ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${nonarch_libdir}', '${sysconfdir}', d)}/modules-load.d" +modprobedir ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${nonarch_base_libdir}', '${sysconfdir}', d)}/modprobe.d" KERNEL_SPLIT_MODULES ?= "1" PACKAGESPLITFUNCS =+ "split_kernel_module_packages"
Signature · 1 line
2.34.1
PATCH 13/27 uboot-extlinux-config.bbclass: fix old override syntax in comment
In reply to Steve SakomanFrom: Quentin Schulz <[email protected]>
The comment specifies how to use the variables but uses the older and now unsupported override syntax. Let's update to match the newer syntax.
Cc: Quentin Schulz <[email protected]>
(From OE-Core rev: 0a381eea4d50ff1c6e7c7d0d4df62eb581454b48)
--- meta/classes-recipe/uboot-extlinux-config.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/classes-recipe/uboot-extlinux-config.bbclass +4 -4
@@ -33,11 +33,11 @@ # UBOOT_EXTLINUX_DEFAULT_LABEL ??= "Linux Default" # UBOOT_EXTLINUX_TIMEOUT ??= "30" # -# UBOOT_EXTLINUX_KERNEL_IMAGE_default ??= "../zImage" -# UBOOT_EXTLINUX_MENU_DESCRIPTION_default ??= "Linux Default" +# UBOOT_EXTLINUX_KERNEL_IMAGE:default ??= "../zImage" +# UBOOT_EXTLINUX_MENU_DESCRIPTION:default ??= "Linux Default" # -# UBOOT_EXTLINUX_KERNEL_IMAGE_fallback ??= "../zImage-fallback" -# UBOOT_EXTLINUX_MENU_DESCRIPTION_fallback ??= "Linux Fallback" +# UBOOT_EXTLINUX_KERNEL_IMAGE:fallback ??= "../zImage-fallback" +# UBOOT_EXTLINUX_MENU_DESCRIPTION:fallback ??= "Linux Fallback" # # Results: #
Signature · 1 line
2.34.1
PATCH 14/27 mdadm: fix util-linux ptest dependency
In reply to Steve SakomanFrom: Ovidiu Panait <[email protected]>
Trying to run mdadm-ptest in a core-image-minimal build will result in:
root@qemux86-64:~# ptest-runner mdadm START: ptest-runner BEGIN: /usr/lib/mdadm/ptest which: no lsblk in (/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin) lsblk command not found! DURATION: 0 END: /usr/lib/mdadm/ptest 2023-06-28T10:14 STOP: ptest-runner TOTAL: 1 FAIL: 0
Remove util-linux from RRECOMMENDS and only add util-linux-lsblk and util-linux-losetup to RDEPENDS.
--- meta/recipes-extended/mdadm/mdadm_4.2.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-extended/mdadm/mdadm_4.2.bb +1 -2
@@ -101,10 +101,9 @@ do_install_ptest() { } RDEPENDS:${PN} += "bash" -RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs" +RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs util-linux-lsblk util-linux-losetup" RRECOMMENDS:${PN}-ptest += " \ coreutils \ - util-linux \ kernel-module-loop \ kernel-module-linear \ kernel-module-raid0 \
Signature · 1 line
2.34.1
PATCH 15/27 mdadm: fix 07revert-inplace ptest
In reply to Steve SakomanFrom: Ovidiu Panait <[email protected]>
Testcase 07revert-inplace fails if strace is not installed:
...
strace -o /tmp/str ./mdadm -A /dev/md0 --update=revert-reshape /dev/<...> tests/07revert-inplace: line 40: strace: command not found
Add strace to mdadm-ptest RDEPENDS to make sure the testcase passes even with a core-image-minimal build.
--- meta/recipes-extended/mdadm/mdadm_4.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/mdadm/mdadm_4.2.bb +1 -1
@@ -101,7 +101,7 @@ do_install_ptest() { } RDEPENDS:${PN} += "bash" -RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs util-linux-lsblk util-linux-losetup" +RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs util-linux-lsblk util-linux-losetup strace" RRECOMMENDS:${PN}-ptest += " \ coreutils \ kernel-module-loop \
Signature · 1 line
2.34.1
PATCH 16/27 mdadm: fix segfaults when running ptests
In reply to Steve SakomanFrom: Ovidiu Panait <[email protected]>
Currently, some segfaults are reported when running ptest:
mdadm[12333]: segfault at 0 ip 00007fe855924060 sp 00007ffc4d6caf88 error 4 in libc.so.6[7f)
Code: d2 0f 84 b7 0f 00 00 48 83 fa 01 0f 84 b9 0f 00 00 49 89 d3 89 f1 89 f8 48 83 e1 3f 4f
Backport the following upstream commits to fix them:679bd9508a30 ("DDF: Cleanup validate_geometry_ddf_container()") 2b93288a5650 ("DDF: Fix NULL pointer dereference in validate_geometry_ddf()") 548e9b916f86 ("mdadm/Grow: Fix use after close bug by closing after fork") 9ae62977b51d ("monitor: Avoid segfault when calling NULL get_bad_blocks")
The fixes are part of the "Bug fixes and testing improvments" patchset [1].
[1] https://www.spinics.net/lists/raid/msg70621.html
--- ...anup-validate_geometry_ddf_container.patch | 148 ++++++++++++++++++ ...nter-dereference-in-validate_geometr.patch | 56 +++++++ ...se-after-close-bug-by-closing-after-.patch | 91 +++++++++++ ...gfault-when-calling-NULL-get_bad_blo.patch | 42 +++++ meta/recipes-extended/mdadm/mdadm_4.2.bb | 4 + 5 files changed, 341 insertions(+) create mode 100644 meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch create mode 100644 meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch create mode 100644 meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch create mode 100644 meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch
meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch new file +148 -0
@@ -0,0 +1,148 @@ +From ca458f4dcc4de9403298f67543466ce4bbc8f8ae Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe <[email protected]> +Date: Wed, 22 Jun 2022 14:25:07 -0600 +Subject: [PATCH 1/4] DDF: Cleanup validate_geometry_ddf_container() + +Move the function up so that the function declaration is not necessary +and remove the unused arguments to the function. + +No functional changes are intended but will help with a bug fix in the +next patch. + +Signed-off-by: Logan Gunthorpe <[email protected]> +Acked-by: Mariusz Tkaczyk <[email protected]> +Signed-off-by: Jes Sorensen <[email protected]> + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=679bd9508a30 + +Signed-off-by: Ovidiu Panait <[email protected]> +--- + super-ddf.c | 88 ++++++++++++++++++++++++----------------------------- + 1 file changed, 39 insertions(+), 49 deletions(-) + +diff --git a/super-ddf.c b/super-ddf.c +index 3f304cd..65cf727 100644 +--- a/super-ddf.c ++++ b/super-ddf.c +@@ -503,13 +503,6 @@ struct ddf_super { + static int load_super_ddf_all(struct supertype *st, int fd, + void **sbp, char *devname); + static int get_svd_state(const struct ddf_super *, const struct vcl *); +-static int +-validate_geometry_ddf_container(struct supertype *st, +- int level, int layout, int raiddisks, +- int chunk, unsigned long long size, +- unsigned long long data_offset, +- char *dev, unsigned long long *freesize, +- int verbose); + + static int validate_geometry_ddf_bvd(struct supertype *st, + int level, int layout, int raiddisks, +@@ -3322,6 +3315,42 @@ static int reserve_space(struct supertype *st, int raiddisks, + return 1; + } + ++static int ++validate_geometry_ddf_container(struct supertype *st, ++ int level, int raiddisks, ++ unsigned long long data_offset, ++ char *dev, unsigned long long *freesize, ++ int verbose) ++{ ++ int fd; ++ unsigned long long ldsize; ++ ++ if (level != LEVEL_CONTAINER) ++ return 0; ++ if (!dev) ++ return 1; ++ ++ fd = dev_open(dev, O_RDONLY|O_EXCL); ++ if (fd < 0) { ++ if (verbose) ++ pr_err("ddf: Cannot open %s: %s\n", ++ dev, strerror(errno)); ++ return 0; ++ } ++ if (!get_dev_size(fd, dev, &ldsize)) { ++ close(fd); ++ return 0; ++ } ++ close(fd); ++ if (freesize) { ++ *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS); ++ if (*freesize == 0) ++ return 0; ++ } ++ ++ return 1; ++} ++ + static int validate_geometry_ddf(struct supertype *st, + int level, int layout, int raiddisks, + int *chunk, unsigned long long size, +@@ -3347,11 +3376,9 @@ static int validate_geometry_ddf(struct supertype *st, + level = LEVEL_CONTAINER; + if (level == LEVEL_CONTAINER) { + /* Must be a fresh device to add to a container */ +- return validate_geometry_ddf_container(st, level, layout, +- raiddisks, *chunk, +- size, data_offset, dev, +- freesize, +- verbose); ++ return validate_geometry_ddf_container(st, level, raiddisks, ++ data_offset, dev, ++ freesize, verbose); + } + + if (!dev) { +@@ -3449,43 +3476,6 @@ static int validate_geometry_ddf(struct supertype *st, + return 1; + } + +-static int +-validate_geometry_ddf_container(struct supertype *st, +- int level, int layout, int raiddisks, +- int chunk, unsigned long long size, +- unsigned long long data_offset, +- char *dev, unsigned long long *freesize, +- int verbose) +-{ +- int fd; +- unsigned long long ldsize; +- +- if (level != LEVEL_CONTAINER) +- return 0; +- if (!dev) +- return 1; +- +- fd = dev_open(dev, O_RDONLY|O_EXCL); +- if (fd < 0) { +- if (verbose) +- pr_err("ddf: Cannot open %s: %s\n", +- dev, strerror(errno)); +- return 0; +- } +- if (!get_dev_size(fd, dev, &ldsize)) { +- close(fd); +- return 0; +- } +- close(fd); +- if (freesize) { +- *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS); +- if (*freesize == 0) +- return 0; +- } +- +- return 1; +-} +- + static int validate_geometry_ddf_bvd(struct supertype *st, + int level, int layout, int raiddisks, + int *chunk, unsigned long long size, +-- +2.39.1 +
meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch new file +56 -0
56 lines not on this page · raw message
meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch new file +91 -0
91 lines not on this page · raw message
meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch new file +42 -0
42 lines not on this page · raw message
meta/recipes-extended/mdadm/mdadm_4.2.bb +4 -0
@@ -32,6 +32,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-tests-fix-raid0-tests-for-0.90-metadata.patch \ file://0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch \ file://0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch \ + file://0001-DDF-Cleanup-validate_geometry_ddf_container.patch \ + file://0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch \ + file://0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch \ + file://0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch \ " SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d"
Signature · 1 line
2.34.1
PATCH 17/27 mdadm: skip running known broken ptests
In reply to Steve SakomanFrom: Ovidiu Panait <[email protected]>
Upstream marked some testcases as "KNOWN BROKEN" and introduced the "--skip-broken" flag to ignore them when running the testsuite (commits [1] and [2]). Backport these two commits to get rid of the last remaining ptest failures.
Also, add the "--skip-broken" option to the run-ptest script.
[1] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=28520bf114b3
[2] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=daa86d663476
--- ...Mark-and-ignore-broken-test-failures.patch | 128 +++++ ...dd-broken-files-for-all-broken-tests.patch | 454 ++++++++++++++++++ meta/recipes-extended/mdadm/files/run-ptest | 2 +- meta/recipes-extended/mdadm/mdadm_4.2.bb | 2 + 4 files changed, 585 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch create mode 100644 meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch
meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch new file +128 -0
@@ -0,0 +1,128 @@ +From feab1f72fcf032a4d21d0a69eb61b23a5ddb3352 Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe <[email protected]> +Date: Wed, 22 Jun 2022 14:25:18 -0600 +Subject: [PATCH 5/6] mdadm/test: Mark and ignore broken test failures + +Add functionality to continue if a test marked as broken fails. + +To mark a test as broken, a file with the same name but with the suffix +'.broken' should exist. The first line in the file will be printed with +a KNOWN BROKEN message; the rest of the file can describe the how the +test is broken. + +Also adds --skip-broken and --skip-always-broken to skip all the tests +that have a .broken file or to skip all tests whose .broken file's first +line contains the keyword always. + +Signed-off-by: Logan Gunthorpe <[email protected]> +Signed-off-by: Jes Sorensen <[email protected]> + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=28520bf114b3 + +[OP: adjusted context for mdadm-4.2] +Signed-off-by: Ovidiu Panait <[email protected]> +--- + test | 37 +++++++++++++++++++++++++++++++++++-- + 1 file changed, 35 insertions(+), 2 deletions(-) + +diff --git a/test b/test +index 8f189d9..ee8fba1 100755 +--- a/test ++++ b/test +@@ -10,6 +10,8 @@ devlist= + + savelogs=0 + exitonerror=1 ++ctrl_c_error=0 ++skipbroken=0 + prefix='[0-9][0-9]' + + # use loop devices by default if doesn't specify --dev +@@ -35,6 +37,7 @@ die() { + + ctrl_c() { + exitonerror=1 ++ ctrl_c_error=1 + } + + # mdadm always adds --quiet, and we want to see any unexpected messages +@@ -79,8 +82,21 @@ mdadm() { + do_test() { + _script=$1 + _basename=`basename $_script` ++ _broken=0 ++ + if [ -f "$_script" ] + then ++ if [ -f "${_script}.broken" ]; then ++ _broken=1 ++ _broken_msg=$(head -n1 "${_script}.broken" | tr -d '\n') ++ if [ "$skipbroken" == "all" ]; then ++ return ++ elif [ "$skipbroken" == "always" ] && ++ [[ "$_broken_msg" == *always* ]]; then ++ return ++ fi ++ fi ++ + rm -f $targetdir/stderr + # this might have been reset: restore the default. + echo 2000 > /proc/sys/dev/raid/speed_limit_max +@@ -97,10 +113,15 @@ do_test() { + else + save_log fail + _fail=1 ++ if [ "$_broken" == "1" ]; then ++ echo " (KNOWN BROKEN TEST: $_broken_msg)" ++ fi + fi + [ "$savelogs" == "1" ] && + mv -f $targetdir/log $logdir/$_basename.log +- [ "$_fail" == "1" -a "$exitonerror" == "1" ] && exit 1 ++ [ "$ctrl_c_error" == "1" ] && exit 1 ++ [ "$_fail" == "1" -a "$exitonerror" == "1" \ ++ -a "$_broken" == "0" ] && exit 1 + fi + } + +@@ -117,6 +138,8 @@ do_help() { + --logdir=directory Directory to save all logfiles in + --save-logs Usually use with --logdir together + --keep-going | --no-error Don't stop on error, ie. run all tests ++ --skip-broken Skip tests that are known to be broken ++ --skip-always-broken Skip tests that are known to always fail + --dev=loop|lvm|ram|disk Use loop devices (default), LVM, RAM or disk + --disks= Provide a bunch of physical devices for test + --volgroup=name LVM volume group for LVM test +@@ -211,6 +234,12 @@ parse_args() { + --keep-going | --no-error ) + exitonerror=0 + ;; ++ --skip-broken ) ++ skipbroken=all ++ ;; ++ --skip-always-broken ) ++ skipbroken=always ++ ;; + --disable-multipath ) + unset MULTIPATH + ;; +@@ -275,7 +304,11 @@ main() { + if [ $script == "$testdir/11spare-migration" ];then + continue + fi +- do_test $script ++ case $script in ++ *.broken) ;; ++ *) ++ do_test $script ++ esac + done + fi + +-- +2.39.1 +
meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch new file +454 -0
454 lines not on this page · raw message
meta/recipes-extended/mdadm/files/run-ptest +1 -1
@@ -2,6 +2,6 @@ mkdir -p /mdadm-testing-dir # make the test continue to execute even one fail -dir=. ./test --keep-going --disable-integrity +dir=. ./test --keep-going --disable-integrity --skip-broken rm -rf /mdadm-testing-dir/*
meta/recipes-extended/mdadm/mdadm_4.2.bb +2 -0
@@ -36,6 +36,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch \ file://0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch \ file://0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch \ + file://0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch \ + file://0006-tests-Add-broken-files-for-all-broken-tests.patch \ " SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d"
Signature · 1 line
2.34.1
PATCH 18/27 mdadm: re-add mdadm-ptest to PTESTS_SLOW
In reply to Steve SakomanFrom: Ovidiu Panait <[email protected]>
The ptest problems reported in e21021dc00ec ("mdadm: drop from PTESTS_SLOW") should now be fixed, so mdadm can be added back to PTESTS_SLOW (a qemux86-64 test run takes about ~12 minutes to execute with kvm).
root@qemux86-64:~# ptest-runner mdadm START: ptest-runner 2023-06-30T08:25 BEGIN: /usr/lib/mdadm/ptest PASS: /usr/lib/mdadm/ptest/tests/00linear PASS: /usr/lib/mdadm/ptest/tests/00multipath ... PASS: /usr/lib/mdadm/ptest/tests/19repair-does-not-destroy PASS: /usr/lib/mdadm/ptest/tests/20raid5journal PASS: /usr/lib/mdadm/ptest/tests/21raid5cache DURATION: 723 END: /usr/lib/mdadm/ptest 2023-06-30T09:16 STOP: ptest-runner TOTAL: 1 FAIL: 0
For the testcases to run correctly, there must be enough rootfs space to create 13 loop devices. Similar to strace and lttng-tools, add a new IMAGE_ROOTFS_EXTRA_SPACE entry for mdadm-ptest.
--- meta/conf/distro/include/ptest-packagelists.inc | 3 +-- meta/recipes-core/images/core-image-ptest.bb | 1 + 2 files changed, 2 insertions(+), 2 deletions(-)
meta/conf/distro/include/ptest-packagelists.inc +1 -2
@@ -96,6 +96,7 @@ PTESTS_SLOW = "\ libgcrypt \ libmodule-build-perl \ lttng-tools \ + mdadm \ openssh \ openssl \ parted \
@@ -119,7 +120,6 @@ PTESTS_PROBLEMS:append:x86 = " valgrind" # rt-tests \ # Needs to be checked whether it runs at all # bash \ # Test outcomes are non-deterministic by design # ifupdown \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py -# mdadm \ # Tests rely on non-deterministic sleep() amounts # libinput \ # Tests need an unloaded system to be reliable # libpam \ # Needs pam DISTRO_FEATURE # numactl \ # qemu not (yet) configured for numa; all tests are skipped
@@ -132,7 +132,6 @@ PTESTS_PROBLEMS = "\ rt-tests \ bash \ ifupdown \ - mdadm \ libinput \ libpam \ libseccomp \
meta/recipes-core/images/core-image-ptest.bb +1 -0
@@ -19,6 +19,7 @@ BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS').split()] # strace-ptest in particular needs more than 500MB IMAGE_OVERHEAD_FACTOR = "1.0" IMAGE_ROOTFS_EXTRA_SPACE = "324288" +IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-mdadm = "1524288" IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-strace = "1024288" IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-lttng-tools = "1524288"
Signature · 1 line
2.34.1
PATCH 19/27 python3: fix missing comma in get_module_deps3.py
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
Wes Tarro <[email protected]> noticed a missing comma in a preplace() call, add it.
That said, calling replace() with one argument results in a TypeError, so this is obviously dead code.
--- meta/recipes-devtools/python/python3/get_module_deps3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3/get_module_deps3.py +1 -1
@@ -32,7 +32,7 @@ def fix_path(dep_path): dep_path = dep_path[dep_path.find(pivot)+len(pivot):] if '/usr/bin' in dep_path: - dep_path = dep_path.replace('/usr/bin''${bindir}') + dep_path = dep_path.replace('/usr/bin','${bindir}') # Handle multilib, is there a better way? if '/usr/lib32' in dep_path:
Signature · 1 line
2.34.1
PATCH 20/27 meson.bbclass: Point to llvm-config from native sysroot
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
Default search in meson would grok /usr/bin for llvm-config and if found will use it, which might add wrong paths into cflags/ldflags, since we depend on llvm-native when building gallium support ( thats when llvm-config is effective), its better to point llvm-config into native sysroot so it can add correct paths into compiler/linker cmdline
--- meta/classes-recipe/meson.bbclass | 1 + 1 file changed, 1 insertion(+)
meta/classes-recipe/meson.bbclass +1 -0
@@ -111,6 +111,7 @@ nm = ${@meson_array('BUILD_NM', d)} strip = ${@meson_array('BUILD_STRIP', d)} readelf = ${@meson_array('BUILD_READELF', d)} objcopy = ${@meson_array('BUILD_OBJCOPY', d)} +llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config' pkgconfig = 'pkg-config-native' ${@rust_tool(d, "BUILD_SYS")}
Signature · 1 line
2.34.1
PATCH 21/27 systemd-systemctl: fix errors in instance name expansion
In reply to Steve SakomanFrom: Yuta Hayama <[email protected]>
If the instance name indicated by %i begins with a number, the meaning of the replacement string "\\1{}".format(instance) is ambiguous.
To indicate group number 1 regardless of the instance name, use "\g<1>".
--- meta/recipes-core/systemd/systemd-systemctl/systemctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd-systemctl/systemctl +1 -1
@@ -202,7 +202,7 @@ class SystemdUnit(): try: for dependent in config.get('Install', prop): # expand any %i to instance (ignoring escape sequence %%) - dependent = re.sub("([^%](%%)*)%i", "\\1{}".format(instance), dependent) + dependent = re.sub("([^%](%%)*)%i", "\\g<1>{}".format(instance), dependent) wants = systemdir / "{}.{}".format(dependent, dirstem) / service add_link(wants, target)
Signature · 1 line
2.34.1
PATCH 22/27 oeqa/runtime/cases/rpm: fix wait_for_no_process_for_user failure case
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
str.format() doesn't use % notation, update the formatting to work.
assertTrue() is a member of self not a global, and assertTrue(True) will always pass. Change this to just self.fail() as this is the failure case.
--- meta/lib/oeqa/runtime/cases/rpm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/rpm.py +2 -2
@@ -59,8 +59,8 @@ class RpmBasicTest(OERuntimeTestCase): return time.sleep(1) user_pss = [ps for ps in output.split("\n") if u + ' ' in ps] - msg = "There're %s 's process(es) still running: %s".format(u, "\n".join(user_pss)) - assertTrue(True, msg=msg) + msg = "User %s has processes still running: %s" % (u, "\n".join(user_pss)) + self.fail(msg=msg) def unset_up_test_user(u): # ensure no test1 process in running
Signature · 1 line
2.34.1
PATCH 23/27 rootfs_rpm: don't depend on opkg-native for update-alternatives
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
opkg-native hasn't provided update-alternatives since 2014[1] so this is the wrong dependency, and image.bbclass depends on the virtual provider virtual/update-alternatives-native already.
[1] oe-core 1e2c38ce13f8e4b25d8656d237343380cbc970aa
--- meta/classes-recipe/rootfs_rpm.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
meta/classes-recipe/rootfs_rpm.bbclass +1 -3
@@ -20,11 +20,9 @@ IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("PACKAGE_INSTALL", "dnf" # Dnf is python based, so be sure python3-native is available to us. EXTRANATIVEPATH += "python3-native" -# opkg is needed for update-alternatives RPMROOTFSDEPENDS = "rpm-native:do_populate_sysroot \ dnf-native:do_populate_sysroot \ - createrepo-c-native:do_populate_sysroot \ - opkg-native:do_populate_sysroot" + createrepo-c-native:do_populate_sysroot" do_rootfs[depends] += "${RPMROOTFSDEPENDS}" do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}"
Signature · 1 line
2.34.1
PATCH 24/27 oeqa/selftest/devtool: add unit test for "devtool add -b"
In reply to Steve SakomanFrom: Yoann Congal <[email protected]>
Fix [Yocto #15085]
--- meta/lib/oeqa/selftest/cases/devtool.py | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
meta/lib/oeqa/selftest/cases/devtool.py +32 -0
@@ -366,6 +366,38 @@ class DevtoolAddTests(DevtoolBase): bindir = bindir[1:] self.assertTrue(os.path.isfile(os.path.join(installdir, bindir, 'pv')), 'pv binary not found in D') + def test_devtool_add_binary(self): + # Create a binary package containing a known test file + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + pn = 'tst-bin' + pv = '1.0' + test_file_dir = "var/lib/%s/" % pn + test_file_name = "test_file" + test_file_content = "TEST CONTENT" + test_file_package_root = os.path.join(tempdir, pn) + test_file_dir_full = os.path.join(test_file_package_root, test_file_dir) + bb.utils.mkdirhier(test_file_dir_full) + with open(os.path.join(test_file_dir_full, test_file_name), "w") as f: + f.write(test_file_content) + bin_package_path = os.path.join(tempdir, "%s.tar.gz" % pn) + runCmd("tar czf %s -C %s ." % (bin_package_path, test_file_package_root)) + + # Test devtool add -b on the binary package + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake -c cleansstate %s' % pn) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool add -b %s %s' % (pn, bin_package_path)) + self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') + + # Build the resulting recipe + result = runCmd('devtool build %s' % pn) + installdir = get_bb_var('D', pn) + self.assertTrue(installdir, 'Could not query installdir variable') + + # Check that a known file from the binary package has indeed been installed + self.assertTrue(os.path.isfile(os.path.join(installdir, test_file_dir, test_file_name)), '%s not found in D' % test_file_name) + def test_devtool_add_git_local(self): # We need dbus built so that DEPENDS recognition works bitbake('dbus')
Signature · 1 line
2.34.1
PATCH 25/27 openssl: add PERLEXTERNAL path to test its existence
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
When upstream change is better to fail or removing the PERL5LIB if they are not need anymore.
--- meta/recipes-connectivity/openssl/openssl_3.1.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-connectivity/openssl/openssl_3.1.1.bb +3 -1
@@ -137,7 +137,9 @@ do_configure () { fi # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the # environment variables set by bitbake. Adjust the environment variables instead. - HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ + PERLEXTERNAL="${S}/external/perl/Text-Template-1.46/lib" + test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!" + HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \ perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target perl ${B}/configdata.pm --dump }
Signature · 1 line
2.34.1
PATCH 26/27 openssl: use a glob on the PERLEXTERNAL to track updates on the path
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
The Text-Template was updated from 1.46 to 1.56
| ERROR: openssl-native-3.1.1-r0 do_configure: PERLEXTERNAL '/build/tmp/work/x86_64-linux/openssl-native/3.1.1-r0/openssl-3.1.1/external/perl/Text-Template-1.46/lib' not found!
--- meta/recipes-connectivity/openssl/openssl_3.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/openssl/openssl_3.1.1.bb +1 -1
@@ -137,7 +137,7 @@ do_configure () { fi # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the # environment variables set by bitbake. Adjust the environment variables instead. - PERLEXTERNAL="${S}/external/perl/Text-Template-1.46/lib" + PERLEXTERNAL="$(realpath ${S}/external/perl/Text-Template-*/lib)" test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!" HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \ perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target
Signature · 1 line
2.34.1
PATCH 27/27 util-linux: add alternative links for ipcs,ipcrm
In reply to Steve SakomanFrom: Benjamin Bouvier <[email protected]>
When enabling ipcs and ipcrm configuration into busybox, both tools are built and then deployed during do_rootfs. These operation lead to below issue (similar behavior happens for ipcs):
do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget:${PN} ().
update-alternatives: Error: not linking .../build/tmp/work/board-poky-linux/board-image/1.0-r0/rootfs/usr/bin/ipcrm to /bin/busybox since .../build/tmp/work/board-poky-linux/board-image/1.0-r0/rootfs/usr/bin/ipcrm exists and is not a link
Binaries enter in conflict with same named util-linux utilities during do_rootfs step.
Adding ALTERNATIVE_LINK_NAME for both tools fix the issue.
--- meta/recipes-core/util-linux/util-linux_2.38.1.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-core/util-linux/util-linux_2.38.1.bb +2 -0
@@ -234,6 +234,8 @@ ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" +ALTERNATIVE_LINK_NAME[ipcrm] = "${bindir}/ipcrm" +ALTERNATIVE_LINK_NAME[ipcs] = "${bindir}/ipcs" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" ALTERNATIVE:${PN}-last = "last lastb" ALTERNATIVE_LINK_NAME[last] = "${bindir}/last"
Signature · 1 line
2.34.1