From patchwork Fri Oct 18 10:01:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 50856 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF6E2D2FFE0 for ; Fri, 18 Oct 2024 10:01:47 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.18591.1729245701754297173 for ; Fri, 18 Oct 2024 03:01:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Fb7x+Lty; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.50, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4315839a7c9so19938545e9.3 for ; Fri, 18 Oct 2024 03:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1729245700; x=1729850500; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=i9TXPTSXIpK4odkUyJUXuKNk/uFXcbusCQmCJgiJE34=; b=Fb7x+LtyNBEZ+3bUqFkGRm4edyAr2FwhImI9jj96O8QjVSw+lc/cChNhKPfm2zTrI5 lp0eCXFlpzGA6xU2ktITQnI+SNnFIDVr9fNaxF3aiOFShysd0HsRuHLiAOq6gA3C0qJf +Qylkb5F8uRujhNXiaOlaIJDbzUMJ+jYDxS2w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729245700; x=1729850500; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=i9TXPTSXIpK4odkUyJUXuKNk/uFXcbusCQmCJgiJE34=; b=qgjxWsOSiHtpAg5/TakCiExlyHI+2VUdDHAlKwefFI+XyLETSqiY1A05o3cNcKPNFQ lASS0z+G3m41zfcj5r5DNiILFSB+3Az2eMy4BW07drZBsPjmXlPQR9MxHUCBdMTP4X3b hVB6L2w4zr6UWIs/swjQA4cBaQtPECajdXj0jOVfbxkhJ26bg5K0VXoGNIwihb2ClPz4 21jpvLOm9TYl1bBODiFFOdNuYJcxpNczaeic42JDj9IpKR9G6oiwI/EvcQkQCAGdZUDZ biIFrncgT1lC9IXJNfV4r03W4e1UtXYTNbUpg+htjj0QMg2vtFAlb1LO6szYUdRf6GpT rV9A== X-Gm-Message-State: AOJu0YzOS5Hcq0KvjSr5XIF7+9HlKhd+mCy1Z19VBzBt/5QOi5a1wl+r kqs1HdxTe5ihwDr38B2VSIlyi8K32GKXqVllV7NNVwdJfz6Ds+Nk6p9oQony2VgX/bIXvr4KUVd e X-Google-Smtp-Source: AGHT+IFuOIMt63uwAzVY0RW+PPBqB0pOjaM4RzJNIC5vVnvFhy+yHsbajoUtaertrRvuZsaHBgVpkQ== X-Received: by 2002:adf:e703:0:b0:37d:5496:290c with SMTP id ffacd0b85a97d-37eab729a12mr1168399f8f.7.1729245699605; Fri, 18 Oct 2024 03:01:39 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:b6b8:7e19:2b4e:cb76]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ecf0ed5e9sm1491533f8f.76.2024.10.18.03.01.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 03:01:39 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/6] oeqa/runtime/parselogs: Add differnet PCI BAR errors with qemu 9.1.0 Date: Fri, 18 Oct 2024 11:01:33 +0100 Message-ID: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Oct 2024 10:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206045 With wemu 9.1.0 we see parselogs failures with mips and mips64. We've long since ignored these errors so update to continue to do so with the new form. Signed-off-by: Richard Purdie --- .../oeqa/runtime/cases/parselogs-ignores-mipsarch.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/lib/oeqa/runtime/cases/parselogs-ignores-mipsarch.txt b/meta/lib/oeqa/runtime/cases/parselogs-ignores-mipsarch.txt index 9c2677c4cf0..156b0f9c103 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs-ignores-mipsarch.txt +++ b/meta/lib/oeqa/runtime/cases/parselogs-ignores-mipsarch.txt @@ -6,3 +6,14 @@ cacheinfo: Failed to find cpu0 device node # failed when register_sysctl_sz sched_fair_sysctls to kernel # failed when register_sysctl_sz sched_core_sysctls to kernel failed when register_sysctl_sz sched + +# With qemu 9.1.0 +# pci 0000:00:00.0: BAR 2: can't handle BAR above 4GB (bus address 0x1f00000010) +# pci 0000:00:00.0: BAR 5: error updating (0x1105d034 != 0x0100d034) +BAR 0: error updating +BAR 1: error updating +BAR 2: error updating +BAR 3: error updating +BAR 4: error updating +BAR 5: error updating +: can't handle BAR above 4GB From patchwork Fri Oct 18 10:01:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 50861 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE0D0D2FFEC for ; Fri, 18 Oct 2024 10:01:47 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web11.18924.1729245702293609355 for ; Fri, 18 Oct 2024 03:01:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=dT8JIqcd; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.53, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4315e9e9642so11676555e9.0 for ; Fri, 18 Oct 2024 03:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1729245700; x=1729850500; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=t8yqxervXqkxhCLcITSC0OxGBPCbxtyMAeB0FuY2pts=; b=dT8JIqcdLpJQn/8rJB1qXe/VXifkt3ul8C5N7LZDDtYV55gg5zEV0RO0+W4Mnm3/v4 LkRFMXci4gGZeIZIe1FzpxA1IeqPPTK4OM2KyfJlmYHF2qvHXrA3cn9j9aNtujvVAc+B W/NvsaYg1wmJKGX0K8wzeqIxVwPvCMIqeAWXg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729245700; x=1729850500; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t8yqxervXqkxhCLcITSC0OxGBPCbxtyMAeB0FuY2pts=; b=EmLo26+Rhr77/0S4k44HSjzkxZWze4+IZYHsRHbr7H8pVsnZ2lUPFUqfduKEdaZvLl AH2dNNPzFcGTlKrQ5gyiSY6oRjTjUCEJSzXQdAzNGdM43ao8YghYMyDiZdmL0ds1tEVS ydQPm6WNH77POcjgSZgEptDNcXR6QbuhDoMzb2tS2JwLl2m6rIzthz5RbAclXE0p19hu 0441SVPBhJnktKQF7xbsGf1DBeI8Q5ETdkvkDjd04AaZMWZ1ddQbGOf9zdXyPjws5QbC 6ZbP9Kp2bxj1xLA+0E7Nh/jEHqqzvDWgbWNNfavH1lFuirW5DDzCbiMRNB2CgDpN8Zca 5whg== X-Gm-Message-State: AOJu0YwEE5pDo7FSVPe+joTZc2cbzHdzg968zTR7/YzpjzC6Bjcodyz6 g+ZESrfqMsTOZKLGXxTd6piLytbQ+RNW4QsOqDj98T4UhDUiCQjAQdBGCaBuw5eU2Fl5ioTHctm M X-Google-Smtp-Source: AGHT+IFFpNs/oIAusrvrf9g1MeD/HtdPMbzY3+DyK35xO6K8s/hgI6Cx9/wBUXmnxLwwHwmt++0eUg== X-Received: by 2002:a05:600c:674a:b0:431:508a:1a7b with SMTP id 5b1f17b1804b1-431616a3f91mr13398245e9.34.1729245700209; Fri, 18 Oct 2024 03:01:40 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:b6b8:7e19:2b4e:cb76]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ecf0ed5e9sm1491533f8f.76.2024.10.18.03.01.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 03:01:39 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/6] qemu: Upgrade 9.0.1 -> 9.1.0 Date: Fri, 18 Oct 2024 11:01:34 +0100 Message-ID: <20241018100138.2341819-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> References: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Oct 2024 10:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206046 Drop the gnutls patch since something equivalent was merged upsteam. Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- ...u-native_9.0.2.bb => qemu-native_9.1.0.bb} | 0 ...e_9.0.2.bb => qemu-system-native_9.1.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 3 +- ...dd-pkg-config-handling-for-libgcrypt.patch | 31 ----------------- ...d-use-relative-path-to-refer-to-file.patch | 34 +++++++++---------- .../qemu/{qemu_9.0.2.bb => qemu_9.1.0.bb} | 0 7 files changed, 19 insertions(+), 51 deletions(-) rename meta/recipes-devtools/qemu/{qemu-native_9.0.2.bb => qemu-native_9.1.0.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_9.0.2.bb => qemu-system-native_9.1.0.bb} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch rename meta/recipes-devtools/qemu/{qemu_9.0.2.bb => qemu_9.1.0.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 1d2771239e7..b1cc8b12855 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.43%" GDBVERSION ?= "15.%" GLIBCVERSION ?= "2.40%" LINUXLIBCVERSION ?= "6.10%" -QEMUVERSION ?= "9.0%" +QEMUVERSION ?= "9.1%" GOVERSION ?= "1.22%" RUSTVERSION ?= "1.79%" diff --git a/meta/recipes-devtools/qemu/qemu-native_9.0.2.bb b/meta/recipes-devtools/qemu/qemu-native_9.1.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_9.0.2.bb rename to meta/recipes-devtools/qemu/qemu-native_9.1.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_9.0.2.bb b/meta/recipes-devtools/qemu/qemu-system-native_9.1.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_9.0.2.bb rename to meta/recipes-devtools/qemu/qemu-system-native_9.1.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 223de71efee..02cd7c8dc8f 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -24,7 +24,6 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://fix-strerrorname_np.patch \ file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ file://0002-apic-fixup-fallthrough-to-PIC.patch \ - file://0003-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://0004-qemu-Do-not-include-file-if-not-exists.patch \ file://0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \ file://0006-qemu-Determinism-fixes.patch \ @@ -39,7 +38,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "a8c3f596aece96da3b00cafb74baafa0d14515eafb8ed1ee3f7f5c2d0ebf02b6" +SRC_URI[sha256sum] = "816b7022a8ba7c2ac30e2e0cf973e826f6bcc8505339603212c5ede8e94d7834" CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default." diff --git a/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch deleted file mode 100644 index 30e269f8f4f..00000000000 --- a/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e4f6c6b9f43b28271bc9dc6cbcafad53f80387e0 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [PATCH 03/11] configure: Add pkg-config handling for libgcrypt - -libgcrypt may also be controlled by pkg-config, this patch adds pkg-config -handling for libgcrypt. - -Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] - -Signed-off-by: He Zhe ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 91a0aa64c6..e8373d55b8 100644 ---- a/meson.build -+++ b/meson.build -@@ -1655,7 +1655,7 @@ endif - if not gnutls_crypto.found() - if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled() - gcrypt = dependency('libgcrypt', version: '>=1.8', -- method: 'config-tool', -+ method: 'pkg-config', - required: get_option('gcrypt')) - # Debian has removed -lgpg-error from libgcrypt-config - # as it "spreads unnecessary dependencies" which in --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch index 74de158b2e3..5471b77e18d 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch @@ -16,20 +16,23 @@ Signed-off-by: Changqing Li tests/unit/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/tests/unit/meson.build b/tests/unit/meson.build -index 228a21d03c..272fb4c6ca 100644 ---- a/tests/unit/meson.build -+++ b/tests/unit/meson.build -@@ -47,7 +47,7 @@ tests = { - 'test-keyval': [testqapi], - 'test-logging': [], - 'test-uuid': [], -- 'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'], -+ 'ptimer-test': ['ptimer-test-stubs.c', '../../hw/core/ptimer.c'], - 'test-qapi-util': [], - 'test-interval-tree': [], - 'test-xs-node': [qom], -@@ -138,7 +138,7 @@ if have_system +Index: qemu-9.1.0/tests/unit/meson.build +=================================================================== +--- qemu-9.1.0.orig/tests/unit/meson.build ++++ qemu-9.1.0/tests/unit/meson.build +@@ -128,17 +128,17 @@ endif + + if have_system + tests += { +- 'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'], ++ 'ptimer-test': ['ptimer-test-stubs.c', '../../hw/core/ptimer.c'], + 'test-iov': [], + 'test-opts-visitor': [testqapi], + 'test-xs-node': [qom], +- 'test-virtio-dmabuf': [meson.project_source_root() / 'hw/display/virtio-dmabuf.c'], ++ 'test-virtio-dmabuf': ['../../hw/display/virtio-dmabuf.c'], + 'test-qmp-cmds': [testqapi], + 'test-xbzrle': [migration], 'test-util-sockets': ['socket-helpers.c'], 'test-base64': [], 'test-bufferiszero': [], @@ -38,6 +41,3 @@ index 228a21d03c..272fb4c6ca 100644 'test-vmstate': [migration, io], 'test-yank': ['socket-helpers.c', qom, io, chardev] } --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu_9.0.2.bb b/meta/recipes-devtools/qemu/qemu_9.1.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_9.0.2.bb rename to meta/recipes-devtools/qemu/qemu_9.1.0.bb From patchwork Fri Oct 18 10:01:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 50860 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EACA2D2FFED for ; Fri, 18 Oct 2024 10:01:47 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web10.18592.1729245702799580400 for ; Fri, 18 Oct 2024 03:01:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=ib1WzmLr; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.47, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-37d51055097so1338278f8f.3 for ; Fri, 18 Oct 2024 03:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1729245701; x=1729850501; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fWuMznFxFJtEgBb4ivOpVcj/nR4bZSfUcXmC8B2IQgc=; b=ib1WzmLrjUVQ0Oib7TLLb/cOiNtTLBTLzXq3yWSFjRek0rsNMWEYPq6Bea55XcfOYZ 5VOm9b2UsEnniKfrdQPNTqgm2ezaZoOIiSBox76kTTssDM3rniY8xlmPv1S3HYR877VC mIynvyTsNYS/zDZW3O2mcNHxK+ViiS4BwyApA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729245701; x=1729850501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fWuMznFxFJtEgBb4ivOpVcj/nR4bZSfUcXmC8B2IQgc=; b=Rpe07QO6BiBaBEHayBF+/gt1/zFPPR6ibbjsBBbfmynRrrQ1OlZaa78Qu5uhgm/BYq zQhqHJbK97G1CMdH1lxoxl50kQjcqeMCv+F4IVCF7+lAyN+c2or2SRrBGdkI7VOPud5G hxA5p4tBcHGxdMTICr3Ay9Ey1askzEMa6iE2VwCcbtNBp67ifuN/OX2l1GOD29uL4qrS x9sM54xPIQ9kHsW4AOImEp7sE1YgOojVmU5UoPafrLKEuBZgkvj+xBL4T+aW1kwhkKOv 9pJdKNXYssPu0NxtqAzMwXoqVH9mxrEHaQb3eoykTBSUtALdnQT2QHxycfs0Op7cueqD e8uA== X-Gm-Message-State: AOJu0Yw20lbnF7Ekh5DcHzXDHn8Ewuj53ygxns8WSpk4l3igwRPF8g59 Y+Xw3ZAuBXWvmxy9uIAoL15glzTdtBDUyDb6CrDLKfMCLbZ4H0W4+TNVszZLmhVsW4pFjAKZg5L z X-Google-Smtp-Source: AGHT+IEml/3stl06uAXaA16cJ6syb6rYyqzMsujFKW6uA9p7/xO0P9la+Md0T2Su9ICWseFmce7KRQ== X-Received: by 2002:adf:ecc3:0:b0:37d:45ad:8394 with SMTP id ffacd0b85a97d-37ea2164cf9mr1145121f8f.15.1729245700872; Fri, 18 Oct 2024 03:01:40 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:b6b8:7e19:2b4e:cb76]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ecf0ed5e9sm1491533f8f.76.2024.10.18.03.01.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 03:01:40 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/6] python3-markupsafe: Upgrade 2.1.5 -> 3.0.1 Date: Fri, 18 Oct 2024 11:01:35 +0100 Message-ID: <20241018100138.2341819-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> References: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Oct 2024 10:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206047 Update to match the upstream repo name change and the renamed license file. Signed-off-by: Richard Purdie --- ...hon3-markupsafe_2.1.5.bb => python3-markupsafe_3.0.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-markupsafe_2.1.5.bb => python3-markupsafe_3.0.1.bb} (74%) diff --git a/meta/recipes-devtools/python/python3-markupsafe_2.1.5.bb b/meta/recipes-devtools/python/python3-markupsafe_3.0.1.bb similarity index 74% rename from meta/recipes-devtools/python/python3-markupsafe_2.1.5.bb rename to meta/recipes-devtools/python/python3-markupsafe_3.0.1.bb index 821332fe7cd..294532c6af0 100644 --- a/meta/recipes-devtools/python/python3-markupsafe_2.1.5.bb +++ b/meta/recipes-devtools/python/python3-markupsafe_3.0.1.bb @@ -1,11 +1,11 @@ SUMMARY = "Implements a XML/HTML/XHTML Markup safe string for Python" HOMEPAGE = "http://github.com/mitsuhiko/markupsafe" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b" +SRC_URI[sha256sum] = "3e683ee4f5d0fa2dde4db77ed8dd8a876686e3fc417655c2ece9a90576905344" -PYPI_PACKAGE = "MarkupSafe" +PYPI_PACKAGE = "markupsafe" inherit pypi python_setuptools_build_meta ptest RDEPENDS:${PN} += "python3-stringold" From patchwork Fri Oct 18 10:01:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 50858 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE015D2FFEB for ; Fri, 18 Oct 2024 10:01:47 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.web11.18926.1729245703533332834 for ; Fri, 18 Oct 2024 03:01:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=J2L7EUva; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.45, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-430576ff251so19172255e9.0 for ; Fri, 18 Oct 2024 03:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1729245702; x=1729850502; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YAE0cX3/d8b9sagUnU8jVpOV89F4Oy3ZzS5WOCTPcr8=; b=J2L7EUvaBBmMf2e3LIHrU4Rl0deS4CVzFG+HQI1ukNlVFGL0dcONh9rbHfE52E75BP mqh2AZqMWqz3ZBJpysvUFCOKWRdRfGDWq3fQugJje8SaZTELHoNgOICrYvxCRq7bVe8k t9WwNHTxqxZodkXSq6acSomFt+Hjn26YScsVU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729245702; x=1729850502; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YAE0cX3/d8b9sagUnU8jVpOV89F4Oy3ZzS5WOCTPcr8=; b=obkWXJK4arvb6HL+6VLyJPQunWzAFPZMNCRmudySnIZwzpmuLcQhshXbgqb+jQC4nw peDP1POx7HGcKkZL9xLBq7iz4hhVX3f+pj1JNOK0XjMcJjzdnYmB5MeFaJUnMAcQL2BS 97uf4lb4c0T20l7MiRkDFUGg8S5jdYIh1ENNAwMOrgFiZlNVZA7VyD0omYjmrsioX8Lw 6Dvq6aj5cLRJIc+YRLbvbPaW/fr0QzO55gwDczxLUrTG8C1gMNvfjGM8tIcwUuzOf3wh 4uAH91ehBbpPgyzghHWuPIkHTv8lBN2xxe7honPPezXV2yieQ1zmtz46c8Q4OoVE4J+m ZNMQ== X-Gm-Message-State: AOJu0YwWTdFSquaXGbwbAuVcJgRavYBfAPEnSLdUIaMEZ53OuUBNbOjj aZ/u6vV0UDycNtz8H7Py3LCJ0dbIfau5ZaYI9fbjaQ4fX0QUb2GwCm88XMnOaDoD9p1R40g/IOt y X-Google-Smtp-Source: AGHT+IHALyxCQ5TnT1Qf360Jcp4qAboW/MZat24Iblo90d6HBqg7BAj8lLPdCsgX2zee7qRTECFWlA== X-Received: by 2002:a05:600c:3b8c:b0:431:54a1:360e with SMTP id 5b1f17b1804b1-431616976dbmr14261245e9.32.1729245701494; Fri, 18 Oct 2024 03:01:41 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:b6b8:7e19:2b4e:cb76]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ecf0ed5e9sm1491533f8f.76.2024.10.18.03.01.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 03:01:41 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/6] ppp: Upgrade 2.5.0 -> 2.5.1 Date: Fri, 18 Oct 2024 11:01:36 +0100 Message-ID: <20241018100138.2341819-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> References: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Oct 2024 10:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206048 The license on chat.c was clarified to MIT with a license identifier so add to LICENSE as such. The ccp.c change was an email address. Signed-off-by: Richard Purdie --- .../ppp/{ppp_2.5.0.bb => ppp_2.5.1.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-connectivity/ppp/{ppp_2.5.0.bb => ppp_2.5.1.bb} (93%) diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.0.bb b/meta/recipes-connectivity/ppp/ppp_2.5.1.bb similarity index 93% rename from meta/recipes-connectivity/ppp/ppp_2.5.0.bb rename to meta/recipes-connectivity/ppp/ppp_2.5.1.bb index 36e2585de42..5b8c49ca850 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.5.0.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.1.bb @@ -5,11 +5,11 @@ SECTION = "console/network" HOMEPAGE = "http://samba.org/ppp/" BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" DEPENDS = "libpcap openssl virtual/crypt" -LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD & RSA-MD" -LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ +LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD & RSA-MD & MIT" +LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=1bea10e81fc6f2df105b1f8b733cb149 \ file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ - file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" + file://chat/chat.c;beginline=1;endline=1;md5=234d7d4edd08962c0144e4604050e0b6" SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://pon \ @@ -25,7 +25,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://ppp@.service \ " -SRC_URI[sha256sum] = "5cae0e8075f8a1755f16ca290eb44e6b3545d3f292af4da65ecffe897de636ff" +SRC_URI[sha256sum] = "733b7f5840b613da4eab0429a5081293275f06ba8b528e1b8eea6964faf0243a" inherit autotools systemd From patchwork Fri Oct 18 10:01:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 50857 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDC70D2FFE6 for ; Fri, 18 Oct 2024 10:01:47 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web10.18593.1729245704637264113 for ; Fri, 18 Oct 2024 03:01:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=QCEbptLa; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.41, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4315eac969aso8697735e9.1 for ; Fri, 18 Oct 2024 03:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1729245703; x=1729850503; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jR5F5vy35INapbmyKaaf7mohlftRaJ7KOSoeYdjPDkA=; b=QCEbptLax2Vv1faWIwqJQ7p3FTkATFvqAZO75uwDWlXbBljLaH9/eVeBTfAKMJe2jf 4cr7lNocKgleMn1ssbzFIZO+utcy6mwoxjZ6tRzhXLVSBFik/EYMkhdwoE2wQQ5vnDse kh/ZOFb0xPCQmrmVUX6RZhgPEzxq2mK4ZVuzI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729245703; x=1729850503; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jR5F5vy35INapbmyKaaf7mohlftRaJ7KOSoeYdjPDkA=; b=CQr1x82tFIYYu1KIPr+IEdp6ZsIybXuN6T0mzPf6tIL7iIjMvGFsWVDqw/v9b0fZf4 fFdAy9LIVYN/ngeA50PAj/zqMIkKEgEGsGRRa4ZDYpbJSPDM5PLn/HX2/v+7dMQpXbzM 3+QX5RHt/bbuqIG1bCW2GwKuuzxA0gX0V+YnGZTXjqWnwNlTdHvXu+QQjTOsoTp8V3SQ AT+WNLWD+pmbs9ShbkRYkgQV/PRFJhCsxMbs4esy6A9DYyy3cBXMFrLLGx0DlMBxOThJ GakyeE/qEa4xZCAaQOaJOuEJ0/7KLdmqWmvaXeuIbiV0G5IC8x2iFH1IakuAMifJNvG9 vJXA== X-Gm-Message-State: AOJu0YxKoqDxh6R2ToasYSBsGKTrnE1++0esKFE4e9jlKp67kzB0MaZO +BMfWhMShdh5iacEo35+wQH5Fhqm5gMVYK5fIr+Asbc2Y+Q0tm6ECJ+97c6RUJI1GEjfAC4v4iG O X-Google-Smtp-Source: AGHT+IGUi+1mu3nS1dCrrQYe04QvQEl/0r7RJo69eWfWzo3N/ajVqY3696kQxIeXATPeGin4+tv3Xg== X-Received: by 2002:a05:600c:4fd2:b0:431:15f1:421d with SMTP id 5b1f17b1804b1-43158760531mr41312865e9.16.1729245702212; Fri, 18 Oct 2024 03:01:42 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:b6b8:7e19:2b4e:cb76]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ecf0ed5e9sm1491533f8f.76.2024.10.18.03.01.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 03:01:41 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/6] lttng: Upgrade 2.13.14 -> 2.13.15 Date: Fri, 18 Oct 2024 11:01:37 +0100 Message-ID: <20241018100138.2341819-5-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> References: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Oct 2024 10:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206050 Drop backported patches now not needed in the new version. Signed-off-by: Richard Purdie --- ...01-Fix-kfree_skb-changed-in-6.11-rc1.patch | 62 ------ ...da_reserve_space-changed-in-6.11-rc1.patch | 55 ----- ...emoved-from-btrfs_get_extent-in-6.11.patch | 64 ------ ...moved-frmo-btrfs_get_extent-in-6.11-.patch | 44 ---- ...removed-from-btrfs_get_extent-in-6.1.patch | 50 ----- ...omic-write-support-added-in-6.11-rc1.patch | 200 ------------------ ...es_2.13.14.bb => lttng-modules_2.13.15.bb} | 8 +- 7 files changed, 1 insertion(+), 482 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-kfree_skb-changed-in-6.11-rc1.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ext4_da_reserve_space-changed-in-6.11-rc1.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix-orig_start-removed-from-btrfs_get_extent-in-6.11.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0005-Fix-block_start-removed-from-btrfs_get_extent-in-6.1.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0006-Fix-scsi-sd-Atomic-write-support-added-in-6.11-rc1.patch rename meta/recipes-kernel/lttng/{lttng-modules_2.13.14.bb => lttng-modules_2.13.15.bb} (72%) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-kfree_skb-changed-in-6.11-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-kfree_skb-changed-in-6.11-rc1.patch deleted file mode 100644 index 36bf697c516..00000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-kfree_skb-changed-in-6.11-rc1.patch +++ /dev/null @@ -1,62 +0,0 @@ -From a06c63b0360cbe1a7c8073461b9cf088234875f7 Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 29 Jul 2024 14:01:18 +0000 -Subject: [PATCH] Fix: kfree_skb changed in 6.11-rc1 - -See upstream commit: - - commit c53795d48ee8f385c6a9e394651e7ee914baaeba - Author: Yan Zhai - Date: Mon Jun 17 11:09:04 2024 -0700 - - net: add rx_sk to trace_kfree_skb - - skb does not include enough information to find out receiving - sockets/services and netns/containers on packet drops. In theory - skb->dev tells about netns, but it can get cleared/reused, e.g. by TCP - stack for OOO packet lookup. Similarly, skb->sk often identifies a local - sender, and tells nothing about a receiver. - - Allow passing an extra receiving socket to the tracepoint to improve - the visibility on receiving drops. - -Upstream-Status: Backport - -Change-Id: I33c8ce1a48006456f198ab1592f733b55be01016 -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/skb.h | 20 +++++++++++++++++++- - 1 file changed, 19 insertions(+), 1 deletion(-) - -diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h -index 9f1047c..5556ab6 100644 ---- a/include/instrumentation/events/skb.h -+++ b/include/instrumentation/events/skb.h -@@ -40,7 +40,25 @@ LTTNG_TRACEPOINT_ENUM(skb_drop_reason, - ) - #endif - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \ -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0)) -+LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb, -+ -+ skb_kfree, -+ -+ TP_PROTO(struct sk_buff *skb, void *location, -+ enum skb_drop_reason reason, struct sock *rx_sk), -+ -+ TP_ARGS(skb, location, reason, rx_sk), -+ -+ TP_FIELDS( -+ ctf_integer_hex(void *, skbaddr, skb) -+ ctf_integer_hex(void *, location, location) -+ ctf_integer_network(unsigned short, protocol, skb->protocol) -+ ctf_enum(skb_drop_reason, uint8_t, reason, reason) -+ ctf_integer_hex(void *, rx_skaddr, rx_sk) -+ ) -+) -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \ - || LTTNG_KERNEL_RANGE(5,15,58, 5,16,0) \ - || LTTNG_RHEL_KERNEL_RANGE(5,14,0,70,0,0, 5,15,0,0,0,0) \ - || LTTNG_RHEL_KERNEL_RANGE(4,18,0,477,10,1, 4,19,0,0,0,0)) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ext4_da_reserve_space-changed-in-6.11-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ext4_da_reserve_space-changed-in-6.11-rc1.patch deleted file mode 100644 index e62717baeb4..00000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ext4_da_reserve_space-changed-in-6.11-rc1.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bfb177d2745d19cb56a27c438f4925d6397fbf0b Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 29 Jul 2024 14:08:32 +0000 -Subject: [PATCH] Fix: ext4_da_reserve_space changed in 6.11-rc1 - -See upstream commit: - - commit 0d66b23d79c750276f791411d81a524549a64852 - Author: Zhang Yi - Date: Fri May 17 20:40:02 2024 +0800 - - ext4: make ext4_da_reserve_space() reserve multi-clusters - - Add 'nr_resv' parameter to ext4_da_reserve_space(), which indicates the - number of clusters wants to reserve, make it reserve multiple clusters - at a time. - -Upstream-Status: Backport - -Change-Id: Ib1ce8c3023d53a6d22ec444a435fdb3c871f64c5 -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/ext4.h | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h -index 4131803..9f1d4b1 100644 ---- a/include/instrumentation/events/ext4.h -+++ b/include/instrumentation/events/ext4.h -@@ -821,7 +821,23 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, - ) - #endif - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,13,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0)) -+LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, -+ TP_PROTO(struct inode *inode, int nr_resv), -+ -+ TP_ARGS(inode, nr_resv), -+ -+ TP_FIELDS( -+ ctf_integer(dev_t, dev, inode->i_sb->s_dev) -+ ctf_integer(ino_t, ino, inode->i_ino) -+ ctf_integer(__u64, i_blocks, inode->i_blocks) -+ ctf_integer(__u64, nr_resv, nr_resv) -+ ctf_integer(int, reserved_data_blocks, -+ EXT4_I(inode)->i_reserved_data_blocks) -+ ctf_integer(TP_MODE_T, mode, inode->i_mode) -+ ) -+) -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,13,0)) - LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, - TP_PROTO(struct inode *inode), - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-orig_start-removed-from-btrfs_get_extent-in-6.11.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-orig_start-removed-from-btrfs_get_extent-in-6.11.patch deleted file mode 100644 index 4d06ec76e78..00000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-orig_start-removed-from-btrfs_get_extent-in-6.11.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 1e4cc8d271117af9262e28a5dd19790a0917818c Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 29 Jul 2024 14:11:36 +0000 -Subject: [PATCH] Fix: orig_start removed from btrfs_get_extent in 6.11-rc1 - -See upstream commit: - - commit 4aa7b5d1784f510c0f42afc1d74efb41947221d7 - Author: Qu Wenruo - Date: Tue Apr 30 07:53:04 2024 +0930 - - btrfs: remove extent_map::orig_start member - - Since we have extent_map::offset, the old extent_map::orig_start is just - extent_map::start - extent_map::offset for non-hole/inline extents. - - And since the new extent_map::offset is already verified by - validate_extent_map() while the old orig_start is not, let's just remove - the old member from all call sites. - -Upstream-Status: Backport - -Change-Id: I025a30d49b3e3ddc37d7846acc191ebbdf2ff19e -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/btrfs.h | 24 +++++++++++++++++++++++- - 1 file changed, 23 insertions(+), 1 deletion(-) - -diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h -index c0c746e..dfad19c 100644 ---- a/include/instrumentation/events/btrfs.h -+++ b/include/instrumentation/events/btrfs.h -@@ -177,7 +177,29 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_evict, - ) - #endif - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0)) -+ -+LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, -+ -+ TP_PROTO(const struct btrfs_root *root, const struct btrfs_inode *inode, -+ const struct extent_map *map), -+ -+ TP_ARGS(root, inode, map), -+ -+ TP_FIELDS( -+ ctf_integer(u64, root_objectid, root->root_key.objectid) -+ ctf_integer(u64, ino, btrfs_ino(inode)) -+ ctf_integer(u64, start, map->start) -+ ctf_integer(u64, len, map->len) -+ ctf_integer(u64, block_start, map->block_start) -+ ctf_integer(u64, block_len, map->block_len) -+ ctf_integer(unsigned int, flags, map->flags) -+ ctf_integer(int, refs, refcount_read(&map->refs)) -+ ctf_integer(unsigned int, compress_type, extent_map_compression(map)) -+ ) -+) -+ -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) - - LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch deleted file mode 100644 index c9f48e2f2b2..00000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 974125ab11a7f0b4df5658cdac26dc5cf9fdbc87 Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 29 Jul 2024 14:12:47 +0000 -Subject: [PATCH] Fix: block_len removed frmo btrfs_get_extent in 6.11-rc1 - -See upstream commit: - - commit e28b851ed9b232c3b84cb8d0fedbdfa8ca881386 - Author: Qu Wenruo - Date: Tue Apr 30 07:53:05 2024 +0930 - - btrfs: remove extent_map::block_len member - - The extent_map::block_len is either extent_map::len (non-compressed - extent) or extent_map::disk_num_bytes (compressed extent). - - Since we already have sanity checks to do the cross-checks between the - new and old members, we can drop the old extent_map::block_len now. - - For most call sites, they can manually select extent_map::len or - extent_map::disk_num_bytes, since most if not all of them have checked - if the extent is compressed. - -Upstream-Status: Backport - -Change-Id: Ib03fc685b4e876bf4e53afdd28ca9826342a0e4e -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/btrfs.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h -index dfad19c..28320d8 100644 ---- a/include/instrumentation/events/btrfs.h -+++ b/include/instrumentation/events/btrfs.h -@@ -192,7 +192,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, - ctf_integer(u64, start, map->start) - ctf_integer(u64, len, map->len) - ctf_integer(u64, block_start, map->block_start) -- ctf_integer(u64, block_len, map->block_len) - ctf_integer(unsigned int, flags, map->flags) - ctf_integer(int, refs, refcount_read(&map->refs)) - ctf_integer(unsigned int, compress_type, extent_map_compression(map)) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-block_start-removed-from-btrfs_get_extent-in-6.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-block_start-removed-from-btrfs_get_extent-in-6.1.patch deleted file mode 100644 index 86c72cc6502..00000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-block_start-removed-from-btrfs_get_extent-in-6.1.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b845e79532c9c28c0108bf556171093236460251 Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 29 Jul 2024 14:14:24 +0000 -Subject: [PATCH] Fix: block_start removed from btrfs_get_extent in 6.11-rc1 - -See upstream commit: - - commit c77a8c61002e91d859e118008fd495efbe1d9373 - Author: Qu Wenruo - Date: Tue Apr 30 07:53:06 2024 +0930 - - btrfs: remove extent_map::block_start member - - The member extent_map::block_start can be calculated from - extent_map::disk_bytenr + extent_map::offset for regular extents. - And otherwise just extent_map::disk_bytenr. - - And this is already validated by the validate_extent_map(). Now we can - remove the member. - - However there is a special case in btrfs_create_dio_extent() where we - for NOCOW/PREALLOC ordered extents cannot directly use the resulting - btrfs_file_extent, as btrfs_split_ordered_extent() cannot handle them - yet. - - So for that call site, we pass file_extent->disk_bytenr + - file_extent->num_bytes as disk_bytenr for the ordered extent, and 0 for - offset. - -Upstream-Status: Backport - -Change-Id: I2e3245bb0d1f5263e902659aa05848d5e231909b -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/btrfs.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h -index 28320d8..8fb6866 100644 ---- a/include/instrumentation/events/btrfs.h -+++ b/include/instrumentation/events/btrfs.h -@@ -191,7 +191,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, - ctf_integer(u64, ino, btrfs_ino(inode)) - ctf_integer(u64, start, map->start) - ctf_integer(u64, len, map->len) -- ctf_integer(u64, block_start, map->block_start) - ctf_integer(unsigned int, flags, map->flags) - ctf_integer(int, refs, refcount_read(&map->refs)) - ctf_integer(unsigned int, compress_type, extent_map_compression(map)) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-scsi-sd-Atomic-write-support-added-in-6.11-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-scsi-sd-Atomic-write-support-added-in-6.11-rc1.patch deleted file mode 100644 index 2745e6444aa..00000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-scsi-sd-Atomic-write-support-added-in-6.11-rc1.patch +++ /dev/null @@ -1,200 +0,0 @@ -From d0797fe4bce357d419d2f1f8a3cfe2f8e71ebfdb Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 29 Jul 2024 14:23:02 +0000 -Subject: [PATCH] Fix: scsi: sd: Atomic write support added in 6.11-rc1 - -See upstream commit: - - commit bf4ae8f2e6407a779c0368eb0f3e047a8333be17 - Author: John Garry - Date: Thu Jun 20 12:53:57 2024 +0000 - - scsi: sd: Atomic write support - - Support is divided into two main areas: - - reading VPD pages and setting sdev request_queue limits - - support WRITE ATOMIC (16) command and tracing - - The relevant block limits VPD page need to be read to allow the block layer - request_queue atomic write limits to be set. These VPD page limits are - described in sbc4r22 section 6.6.4 - Block limits VPD page. - - There are five limits of interest: - - MAXIMUM ATOMIC TRANSFER LENGTH - - ATOMIC ALIGNMENT - - ATOMIC TRANSFER LENGTH GRANULARITY - - MAXIMUM ATOMIC TRANSFER LENGTH WITH BOUNDARY - - MAXIMUM ATOMIC BOUNDARY SIZE - - MAXIMUM ATOMIC TRANSFER LENGTH is the maximum length for a WRITE ATOMIC - (16) command. It will not be greater than the device MAXIMUM TRANSFER - LENGTH. - - ATOMIC ALIGNMENT and ATOMIC TRANSFER LENGTH GRANULARITY are the minimum - alignment and length values for an atomic write in terms of logical blocks. - - Unlike NVMe, SCSI does not specify an LBA space boundary, but does specify - a per-IO boundary granularity. The maximum boundary size is specified in - MAXIMUM ATOMIC BOUNDARY SIZE. When used, this boundary value is set in the - WRITE ATOMIC (16) ATOMIC BOUNDARY field - layout for the WRITE_ATOMIC_16 - command can be found in sbc4r22 section 5.48. This boundary value is the - granularity size at which the device may atomically write the data. A value - of zero in WRITE ATOMIC (16) ATOMIC BOUNDARY field means that all data must - be atomically written together. - - MAXIMUM ATOMIC TRANSFER LENGTH WITH BOUNDARY is the maximum atomic write - length if a non-zero boundary value is set. - - For atomic write support, the WRITE ATOMIC (16) boundary is not of much - interest, as the block layer expects each request submitted to be executed - be atomically written together. - - MAXIMUM ATOMIC TRANSFER LENGTH WITH BOUNDARY is the maximum atomic write - length if a non-zero boundary value is set. - - For atomic write support, the WRITE ATOMIC (16) boundary is not of much - interest, as the block layer expects each request submitted to be executed - atomically. However, the SCSI spec does leave itself open to a quirky - scenario where MAXIMUM ATOMIC TRANSFER LENGTH is zero, yet MAXIMUM ATOMIC - TRANSFER LENGTH WITH BOUNDARY and MAXIMUM ATOMIC BOUNDARY SIZE are both - non-zero. This case will be supported. - - To set the block layer request_queue atomic write capabilities, sanitize - the VPD page limits and set limits as follows: - - atomic_write_unit_min is derived from granularity and alignment values. - If no granularity value is not set, use physical block size - - atomic_write_unit_max is derived from MAXIMUM ATOMIC TRANSFER LENGTH. In - the scenario where MAXIMUM ATOMIC TRANSFER LENGTH is zero and boundary - limits are non-zero, use MAXIMUM ATOMIC BOUNDARY SIZE for - atomic_write_unit_max. New flag scsi_disk.use_atomic_write_boundary is - set for this scenario. - - atomic_write_boundary_bytes is set to zero always - - SCSI also supports a WRITE ATOMIC (32) command, which is for type 2 - protection enabled. This is not going to be supported now, so check for - T10_PI_TYPE2_PROTECTION when setting any request_queue limits. - - To handle an atomic write request, add support for WRITE ATOMIC (16) - command in handler sd_setup_atomic_cmnd(). Flag use_atomic_write_boundary - is checked here for encoding ATOMIC BOUNDARY field. - - Trace info is also added for WRITE_ATOMIC_16 command. - -Upstream-Status: Backport - -Change-Id: Ie072002fe2184615c72531ac081a324ef18cfb03 -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/scsi.h | 98 ++++++++++++++++++++++++++- - 1 file changed, 97 insertions(+), 1 deletion(-) - -diff --git a/include/instrumentation/events/scsi.h b/include/instrumentation/events/scsi.h -index 52c0ebd..54ba3ee 100644 ---- a/include/instrumentation/events/scsi.h -+++ b/include/instrumentation/events/scsi.h -@@ -16,7 +16,103 @@ - - #define scsi_opcode_name(opcode) { opcode, #opcode } - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,7,0) \ -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0)) -+ -+#define show_opcode_name(val) \ -+ __print_symbolic(val, \ -+ scsi_opcode_name(TEST_UNIT_READY), \ -+ scsi_opcode_name(REZERO_UNIT), \ -+ scsi_opcode_name(REQUEST_SENSE), \ -+ scsi_opcode_name(FORMAT_UNIT), \ -+ scsi_opcode_name(READ_BLOCK_LIMITS), \ -+ scsi_opcode_name(REASSIGN_BLOCKS), \ -+ scsi_opcode_name(INITIALIZE_ELEMENT_STATUS), \ -+ scsi_opcode_name(READ_6), \ -+ scsi_opcode_name(WRITE_6), \ -+ scsi_opcode_name(SEEK_6), \ -+ scsi_opcode_name(READ_REVERSE), \ -+ scsi_opcode_name(WRITE_FILEMARKS), \ -+ scsi_opcode_name(SPACE), \ -+ scsi_opcode_name(INQUIRY), \ -+ scsi_opcode_name(RECOVER_BUFFERED_DATA), \ -+ scsi_opcode_name(MODE_SELECT), \ -+ scsi_opcode_name(RESERVE), \ -+ scsi_opcode_name(RELEASE), \ -+ scsi_opcode_name(COPY), \ -+ scsi_opcode_name(ERASE), \ -+ scsi_opcode_name(MODE_SENSE), \ -+ scsi_opcode_name(START_STOP), \ -+ scsi_opcode_name(RECEIVE_DIAGNOSTIC), \ -+ scsi_opcode_name(SEND_DIAGNOSTIC), \ -+ scsi_opcode_name(ALLOW_MEDIUM_REMOVAL), \ -+ scsi_opcode_name(SET_WINDOW), \ -+ scsi_opcode_name(READ_CAPACITY), \ -+ scsi_opcode_name(READ_10), \ -+ scsi_opcode_name(WRITE_10), \ -+ scsi_opcode_name(SEEK_10), \ -+ scsi_opcode_name(POSITION_TO_ELEMENT), \ -+ scsi_opcode_name(WRITE_VERIFY), \ -+ scsi_opcode_name(VERIFY), \ -+ scsi_opcode_name(SEARCH_HIGH), \ -+ scsi_opcode_name(SEARCH_EQUAL), \ -+ scsi_opcode_name(SEARCH_LOW), \ -+ scsi_opcode_name(SET_LIMITS), \ -+ scsi_opcode_name(PRE_FETCH), \ -+ scsi_opcode_name(READ_POSITION), \ -+ scsi_opcode_name(SYNCHRONIZE_CACHE), \ -+ scsi_opcode_name(LOCK_UNLOCK_CACHE), \ -+ scsi_opcode_name(READ_DEFECT_DATA), \ -+ scsi_opcode_name(MEDIUM_SCAN), \ -+ scsi_opcode_name(COMPARE), \ -+ scsi_opcode_name(COPY_VERIFY), \ -+ scsi_opcode_name(WRITE_BUFFER), \ -+ scsi_opcode_name(READ_BUFFER), \ -+ scsi_opcode_name(UPDATE_BLOCK), \ -+ scsi_opcode_name(READ_LONG), \ -+ scsi_opcode_name(WRITE_LONG), \ -+ scsi_opcode_name(CHANGE_DEFINITION), \ -+ scsi_opcode_name(WRITE_SAME), \ -+ scsi_opcode_name(UNMAP), \ -+ scsi_opcode_name(READ_TOC), \ -+ scsi_opcode_name(LOG_SELECT), \ -+ scsi_opcode_name(LOG_SENSE), \ -+ scsi_opcode_name(XDWRITEREAD_10), \ -+ scsi_opcode_name(MODE_SELECT_10), \ -+ scsi_opcode_name(RESERVE_10), \ -+ scsi_opcode_name(RELEASE_10), \ -+ scsi_opcode_name(MODE_SENSE_10), \ -+ scsi_opcode_name(PERSISTENT_RESERVE_IN), \ -+ scsi_opcode_name(PERSISTENT_RESERVE_OUT), \ -+ scsi_opcode_name(VARIABLE_LENGTH_CMD), \ -+ scsi_opcode_name(REPORT_LUNS), \ -+ scsi_opcode_name(MAINTENANCE_IN), \ -+ scsi_opcode_name(MAINTENANCE_OUT), \ -+ scsi_opcode_name(MOVE_MEDIUM), \ -+ scsi_opcode_name(EXCHANGE_MEDIUM), \ -+ scsi_opcode_name(READ_12), \ -+ scsi_opcode_name(WRITE_12), \ -+ scsi_opcode_name(WRITE_VERIFY_12), \ -+ scsi_opcode_name(SEARCH_HIGH_12), \ -+ scsi_opcode_name(SEARCH_EQUAL_12), \ -+ scsi_opcode_name(SEARCH_LOW_12), \ -+ scsi_opcode_name(READ_ELEMENT_STATUS), \ -+ scsi_opcode_name(SEND_VOLUME_TAG), \ -+ scsi_opcode_name(WRITE_LONG_2), \ -+ scsi_opcode_name(READ_16), \ -+ scsi_opcode_name(WRITE_16), \ -+ scsi_opcode_name(VERIFY_16), \ -+ scsi_opcode_name(WRITE_SAME_16), \ -+ scsi_opcode_name(ZBC_OUT), \ -+ scsi_opcode_name(ZBC_IN), \ -+ scsi_opcode_name(SERVICE_ACTION_IN_16), \ -+ scsi_opcode_name(READ_32), \ -+ scsi_opcode_name(WRITE_32), \ -+ scsi_opcode_name(WRITE_SAME_32), \ -+ scsi_opcode_name(ATA_16), \ -+ scsi_opcode_name(WRITE_ATOMIC_16), \ -+ scsi_opcode_name(ATA_12)) -+ -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,7,0) \ - || LTTNG_SLE_KERNEL_RANGE(4,4,9,36,0,0, 4,5,0,0,0,0)) - - #define show_opcode_name(val) \ diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.15.bb similarity index 72% rename from meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.13.15.bb index 5b1e61f3be1..66b3729ce52 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.15.bb @@ -10,18 +10,12 @@ inherit module include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Fix-kfree_skb-changed-in-6.11-rc1.patch \ - file://0002-Fix-ext4_da_reserve_space-changed-in-6.11-rc1.patch \ - file://0003-Fix-orig_start-removed-from-btrfs_get_extent-in-6.11.patch \ - file://0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch \ - file://0005-Fix-block_start-removed-from-btrfs_get_extent-in-6.1.patch \ - file://0006-Fix-scsi-sd-Atomic-write-support-added-in-6.11-rc1.patch \ " # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" -SRC_URI[sha256sum] = "c6449f7ff12ab644a630692a556304e51525ca37d98aebf826796918be0f5da6" +SRC_URI[sha256sum] = "6692554eca50e9d22e71b7c2ee6c7db89d393268d404261212af37c5247c0729" export INSTALL_MOD_DIR="kernel/lttng-modules" From patchwork Fri Oct 18 10:01:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 50859 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D109BD2FFE8 for ; Fri, 18 Oct 2024 10:01:47 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web11.18927.1729245704748073502 for ; Fri, 18 Oct 2024 03:01:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=h8r3w9uj; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.43, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-37d4c1b1455so1452593f8f.3 for ; Fri, 18 Oct 2024 03:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1729245703; x=1729850503; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=CgzpiH/QH+/WiBlxdvAEez1dCRlvCLDJwiqcy0EiqfU=; b=h8r3w9uj6HPBLho1EAFGnAQr0DYFMAbepJfl+s7lXYPr3rTdMR3x1E8EWAtJc3RWhi xoRTPtcSFWxUi60aTBCzdOgj2rcRAZsAQ1aei3yMtN+H2bvrZQpQE1IUEjmJaBydbMny FEnW43rVlDWbroIqIFF0npSJPTWIoRpTuq+ps= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729245703; x=1729850503; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CgzpiH/QH+/WiBlxdvAEez1dCRlvCLDJwiqcy0EiqfU=; b=kW0B6V037Ovn6oLnEYBWd7ybRFnp1G+riZ2ftgGqA2M0K6ueZKDTF0kWgczUZ5fx+/ KsF7RPJTrUfDY+pQM//mWgbu9YOg+WXITytddk9xNqacRhqac6O+VsmUEhryxXGCwKjo FXXUzEDRYBURefPJR/SzYD2OMn5YDsiG6rYST2IleULhrhsOWyUPsdMMOjbI60QFVa3X PZaFLvMHe/Fg7A6asmr593ZjTsLafPiafqDCeCCh0/8T66Wh69ICA7f3nUKS+1gpoPu5 SD+TnhrN2UkSm5Abi0pUSmCoRUI6H5O1NM/+iXLZkrP/2SKCdWXdw2+bNIE/eXDm//ki A6gw== X-Gm-Message-State: AOJu0YyUNS5VvfOOOINIeVuBG7H7Q+BQW1ASxITAt4qQQ1E2ObDcWyW5 JO8kJO2Ecv/IZS1NhIbayV6wP5mGaxCJxO22oxDMkP+gvZpoK3ZzwmZDq96yqowYCm0+S+4hQ03 + X-Google-Smtp-Source: AGHT+IEQpr3Bpzsy9gnaefnmyzbaFmSgEdwkAXmJ3m1wop57PidoBDIjwxfB1googNXWgYsAM5q/bg== X-Received: by 2002:a5d:5512:0:b0:37d:3e8c:f708 with SMTP id ffacd0b85a97d-37eab4ee7d5mr1374975f8f.20.1729245702828; Fri, 18 Oct 2024 03:01:42 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:b6b8:7e19:2b4e:cb76]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ecf0ed5e9sm1491533f8f.76.2024.10.18.03.01.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 03:01:42 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/6] subversion: Upgrade 1.14.3 -> 1.14.4 Date: Fri, 18 Oct 2024 11:01:38 +0100 Message-ID: <20241018100138.2341819-6-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> References: <20241018100138.2341819-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Oct 2024 10:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206049 Signed-off-by: Richard Purdie --- .../subversion/{subversion_1.14.3.bb => subversion_1.14.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/subversion/{subversion_1.14.3.bb => subversion_1.14.4.bb} (97%) diff --git a/meta/recipes-devtools/subversion/subversion_1.14.3.bb b/meta/recipes-devtools/subversion/subversion_1.14.4.bb similarity index 97% rename from meta/recipes-devtools/subversion/subversion_1.14.3.bb rename to meta/recipes-devtools/subversion/subversion_1.14.4.bb index 1cf4e1734bd..0f453db2473 100644 --- a/meta/recipes-devtools/subversion/subversion_1.14.3.bb +++ b/meta/recipes-devtools/subversion/subversion_1.14.4.bb @@ -12,7 +12,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://serfmacro.patch \ " -SRC_URI[sha256sum] = "949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440" +SRC_URI[sha256sum] = "44ead116e72e480f10f123c914bb6f9f8c041711c041ed7abff1b8634a199e3c" inherit autotools pkgconfig gettext python3native