From patchwork Wed Jun 4 15:00:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Yang X-Patchwork-Id: 64298 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 CA671C5B559 for ; Wed, 4 Jun 2025 15:01:03 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.18850.1749049255986460412 for ; Wed, 04 Jun 2025 08:00:56 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=8250162873=liezhi.yang@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5544EbJx018125 for ; Wed, 4 Jun 2025 08:00:55 -0700 Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 471g9rtpd0-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 04 Jun 2025 08:00:55 -0700 (PDT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Wed, 4 Jun 2025 08:00:54 -0700 Received: from ala-lpggp7.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Wed, 4 Jun 2025 08:00:54 -0700 From: To: Subject: [PATCH 1/3] strace: 6.12 -> 6.15 Date: Wed, 4 Jun 2025 08:00:59 -0700 Message-ID: <63b3a2479f9568a25a7ed46c2eacdd1ea67647ea.1749049204.git.liezhi.yang@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: dT8FrS0X0zFfGJUgUwNfhm42eds7oyiu X-Authority-Analysis: v=2.4 cv=VIHdn8PX c=1 sm=1 tr=0 ts=68405fa7 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=6IFa9wvqVegA:10 a=_pA1qYqWAAAA:8 a=t7CeM3EgAAAA:8 a=QyXUC8HyAAAA:8 a=gY22dEAn5uKhEIoPOFIA:9 a=TbLkyeXSistb_kka44-k:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjA0MDExMyBTYWx0ZWRfX1O17zwDFCVHR NNWl+Pca7FPe5fATuMOuSjbCKSIfd7q68fcJodEvxw/aY966Hvh6OhXKLxdLAFNbGNjUaxnjH86 2G9HdwTjUHSQcuh4qcZme1a1GRup35GfjdXlz+swTWAUqia4wGtdvzUaHq56HjE7XlUwRNV5krP U8XEhlw/WwDiuMkUIBKW2jT2JzTRkP24ZFlcZWHKF4Y77u+r+DJHCIDLqr5Gbbu+f/cwJArULGB FyRYZZlC5H37Z7r2380UT5ebReTmjcuxRtgZfc6huvbAapjXsE7zF5pF/xvlu2waoTGW4ZO7GeO N6qKhInWfaOthZae0YbrL+wKAqLFfp+53e+ycrsfEcxRij4r9tGl10SVjpqeeudtojhbXQ51COq iezt2Al9TsdC3jy/nw0VBcbFEGtdcEi9xXbQFvgpHz18ATcsSt8AJpQINWPltzhyUdb/w+S9 X-Proofpoint-ORIG-GUID: dT8FrS0X0zFfGJUgUwNfhm42eds7oyiu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-04_03,2025-06-03_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=855 adultscore=0 malwarescore=0 spamscore=0 impostorscore=0 mlxscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506040113 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 ; Wed, 04 Jun 2025 15:01:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217953 From: Robert Yang * Rebased Makefile-ptest.patch for 6.15 * License-Update: Update copyright year from 2024 to 2025 Signed-off-by: Robert Yang --- meta/recipes-devtools/strace/strace/Makefile-ptest.patch | 7 ++++--- .../strace/{strace_6.12.bb => strace_6.15.bb} | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) rename meta/recipes-devtools/strace/{strace_6.12.bb => strace_6.15.bb} (93%) diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index a78c86f6a1..9520aa8842 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -12,8 +12,9 @@ Signed-off-by: Anuj Mittal tests/Makefile.am | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) + diff --git a/tests/Makefile.am b/tests/Makefile.am -index e1254c3..149570d 100644 +index b29471f..b8b66f0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ @@ -21,10 +22,10 @@ index e1254c3..149570d 100644 MPERS_CC_FLAGS = ARCH_MFLAGS = +TEST_SUITE_LOG = test-suite.log - AM_CFLAGS = $(WARN_CFLAGS) + AM_CFLAGS = $(WARN_CFLAGS) $(TEST_WARN_CFLAGS) bundled_CPPFLAGS = if USE_BUNDLED_HEADERS -@@ -903,3 +904,22 @@ BUILT_SOURCES = ksysent.h +@@ -932,3 +933,22 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../src/scno.am diff --git a/meta/recipes-devtools/strace/strace_6.12.bb b/meta/recipes-devtools/strace/strace_6.15.bb similarity index 93% rename from meta/recipes-devtools/strace/strace_6.12.bb rename to meta/recipes-devtools/strace/strace_6.15.bb index c16e5dc478..d8ac2a53d0 100644 --- a/meta/recipes-devtools/strace/strace_6.12.bb +++ b/meta/recipes-devtools/strace/strace_6.15.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://strace.io" DESCRIPTION = "strace is a diagnostic, debugging and instructional userspace utility for Linux. It is used to monitor and tamper with interactions between processes and the Linux kernel, which include system calls, signal deliveries, and changes of process state." SECTION = "console/utils" LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=2433d82e1432a76dc3eadd9002bfe304" +LIC_FILES_CHKSUM = "file://COPYING;md5=1efaf30bb0084b4a17a6f55f9cbcd25b" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \ file://update-gawk-paths.patch \ @@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ file://0002-tests-Replace-off64_t-with-off_t.patch \ " -SRC_URI[sha256sum] = "c47da93be45b6055f4dc741d7f20efaf50ca10160a5b100c109b294fd9c0bdfe" +SRC_URI[sha256sum] = "8552dfab08abc22a0f2048c98fd9541fd4d71b6882507952780dab7c7c512f51" inherit autotools github-releases ptest From patchwork Wed Jun 4 15:01:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Yang X-Patchwork-Id: 64295 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 B7D78C5B549 for ; Wed, 4 Jun 2025 15:01:03 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.18851.1749049256387556537 for ; Wed, 04 Jun 2025 08:00:56 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=8250162873=liezhi.yang@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5544EbK0018125 for ; Wed, 4 Jun 2025 08:00:56 -0700 Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 471g9rtpd0-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 04 Jun 2025 08:00:55 -0700 (PDT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Wed, 4 Jun 2025 08:00:54 -0700 Received: from ala-lpggp7.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Wed, 4 Jun 2025 08:00:54 -0700 From: To: Subject: [PATCH 2/3] quilt: 0.68 -> 0.69 Date: Wed, 4 Jun 2025 08:01:00 -0700 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: XwLQ2Co9f9ZTNQVbf9RgQFu6rzEWtSMR X-Authority-Analysis: v=2.4 cv=VIHdn8PX c=1 sm=1 tr=0 ts=68405fa8 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=6IFa9wvqVegA:10 a=69wJf7TsAAAA:8 a=KSb9T-wMAAAA:8 a=t7CeM3EgAAAA:8 a=1QmTHMqvIDkuq5SBYM8A:9 a=4dITjGlUcKcA:10 a=Fg1AiH1G6rFz08G2ETeA:22 a=KF4VuIdXkMyp4E_ug72i:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjA0MDExMyBTYWx0ZWRfX/8QYCkHXjhMo 5lGdSkGV3PspUyhtglcqc+TyY1/1KK47mz7K5zsH7Bww2xxCweIieXviScL78olI5PS4dvtjVtf 0nYVPFlWd04KBUrGzhYddVVVzBTfFfpnBpqLvICHumBW/kebL+BHDj/CCtKa2sZPpM1YNvAkwAy SE3zRSHoydNIIOuwOinn/9+G4OKew68m+fFhTa46xjFFiYTlrXgHxbkrucRYBwCOeSn5ea1vihp 0DslQ91xXIJujCgT8VjhKD09t7RaLXnarsdaNL7cUqxTsTuaQ1JENNsGJpru1EtHwmBm5lxW8DF eue4PiQbsTK9sIf924ATUGU7UhqqUVyxd6LuIbgUlY+oHoqDAQc/AKj9lNi7PO1v38y+VTaxi84 XmzJpS5AWzcoL1/rklImkHyOGmm966AKTPHGF5b+PLOA0Uqv8Ruj4hbOGsvyMLJC+ksp+bdP X-Proofpoint-ORIG-GUID: XwLQ2Co9f9ZTNQVbf9RgQFu6rzEWtSMR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-04_03,2025-06-03_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 spamscore=0 impostorscore=0 mlxscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506040113 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 ; Wed, 04 Jun 2025 15:01:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217954 From: Robert Yang Add 0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch to fix: ERROR: quilt-0.69-r0 do_package_qa: QA Issue: /usr/share/quilt/spec-filters/obs contained in package quilt requires /usr/bin/sh, but no providers found in RDEPENDS:quilt? [file-rdeps] Signed-off-by: Robert Yang --- ...lt-native_0.68.bb => quilt-native_0.69.bb} | 0 meta/recipes-devtools/quilt/quilt.inc | 3 +- ...b-spec-filters-obs-usr-bin-sh-bin-sh.patch | 28 +++++++++++++++++++ .../quilt/{quilt_0.68.bb => quilt_0.69.bb} | 0 4 files changed, 30 insertions(+), 1 deletion(-) rename meta/recipes-devtools/quilt/{quilt-native_0.68.bb => quilt-native_0.69.bb} (100%) create mode 100644 meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch rename meta/recipes-devtools/quilt/{quilt_0.68.bb => quilt_0.69.bb} (100%) diff --git a/meta/recipes-devtools/quilt/quilt-native_0.68.bb b/meta/recipes-devtools/quilt/quilt-native_0.69.bb similarity index 100% rename from meta/recipes-devtools/quilt/quilt-native_0.68.bb rename to meta/recipes-devtools/quilt/quilt-native_0.69.bb diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 4bae5c6c19..59d13237e2 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -11,11 +11,12 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://run-ptest \ file://test.sh \ file://0001-tests-Allow-different-output-from-mv.patch \ + file://0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch \ " SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" -SRC_URI[sha256sum] = "fe8c09de03c106e85b3737c8f03ade147c956b79ed7af485a1c8a3858db38426" +SRC_URI[sha256sum] = "555ddffde22da3c86d1caf5a9c1fb8a152ac2b84730437bd39cc08849c9f4852" inherit autotools-brokensep ptest diff --git a/meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch b/meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch new file mode 100644 index 0000000000..219deab0d6 --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch @@ -0,0 +1,28 @@ +From 0e00d22182c4cce3b242dd8f4166d3df238b3a0b Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Wed, 4 Jun 2025 00:21:40 -0700 +Subject: [PATCH] contrib/spec-filters/obs: /usr/bin/sh -> /bin/sh + +The /bin/sh is more common than /usr/bin/sh, the later one doesn't exist on +distributions such as Ubuntu 22.04. + +Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/quilt-dev/2025-06/msg00002.html] + +Signed-off-by: Robert Yang +--- + contrib/spec-filters/obs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/spec-filters/obs b/contrib/spec-filters/obs +index 2f5b169..b675230 100755 +--- a/contrib/spec-filters/obs ++++ b/contrib/spec-filters/obs +@@ -1,4 +1,4 @@ +-#!/usr/bin/sh ++#!/bin/sh + # Basic spec file filter for OBS packages + # https://build.opensuse.org/ + +-- +2.49.0 + diff --git a/meta/recipes-devtools/quilt/quilt_0.68.bb b/meta/recipes-devtools/quilt/quilt_0.69.bb similarity index 100% rename from meta/recipes-devtools/quilt/quilt_0.68.bb rename to meta/recipes-devtools/quilt/quilt_0.69.bb From patchwork Wed Jun 4 15:01:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Yang X-Patchwork-Id: 64296 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 BBF6BC61CE7 for ; Wed, 4 Jun 2025 15:01:03 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.18921.1749049257049548161 for ; Wed, 04 Jun 2025 08:00:57 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=8250162873=liezhi.yang@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5544EbK2018125 for ; Wed, 4 Jun 2025 08:00:56 -0700 Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 471g9rtpd0-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 04 Jun 2025 08:00:56 -0700 (PDT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Wed, 4 Jun 2025 08:00:54 -0700 Received: from ala-lpggp7.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Wed, 4 Jun 2025 08:00:54 -0700 From: To: Subject: [PATCH 3/3] nfs-utils: 2.8.2 -> 2.8.3 Date: Wed, 4 Jun 2025 08:01:01 -0700 Message-ID: <18c63e6317edfe84fd21bba3862949dc30c06ffb.1749049204.git.liezhi.yang@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: DnmmDf2rgPxHmO6TOD_0dJCRjzz5PVM4 X-Authority-Analysis: v=2.4 cv=VIHdn8PX c=1 sm=1 tr=0 ts=68405fa8 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=6IFa9wvqVegA:10 a=gu6fZOg2AAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=20KFwNOVAAAA:8 a=VwQbUJbxAAAA:8 a=9v3m73-Cgt0CSv_JcFQA:9 a=2RSlZUUhi9gRBrsHwhhZ:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjA0MDExMyBTYWx0ZWRfXwXCGAoYcPjxA CpWn9zfcu6s31berKDPJEhO9USGMzMX7jLAylTPtgwsLm8Wik4dACI5uQWliRk9XUpRl6Rl2kQt LLB2g5RiwjJ0GcOJH6V4g1/0TI1Kqx1tu7uOqkmLCOsREwjdYtEuCoyLE36uOkgXlY2/icGJ0Q7 gmqZi4W6tiFRQNvKaiawqy5/Y5CT5E88ntMdg0arMm5KaAQIfq75GgBTVRA7HJrEYh7SKLsM2Vo CxnFlAs/gRjs8adYzN9IhuH4j9Br3BZ4w5Gkasw3+Sw3xeUH2dMZLujmsN3wfsocog38mF/RLes Tw2AC13FN5a5fh83dgdjfW8NK3H0bxNHMDIkx98XsamFMt2Fog/p/+H9XXJr/DaQ2qnp67XMbOr iid2QtQ6ub7NfyvL7RI1WdhS8by53YAHn9A+id1MHfBt8wKNHteCopQ6+Daym2YNtAhPpJPA X-Proofpoint-ORIG-GUID: DnmmDf2rgPxHmO6TOD_0dJCRjzz5PVM4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-04_03,2025-06-03_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 spamscore=0 impostorscore=0 mlxscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506040113 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 ; Wed, 04 Jun 2025 15:01:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217955 From: Robert Yang * Remove upstream merged patches: 0001-Fix-typecast-warning-with-clang.patch 0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch Signed-off-by: Robert Yang --- ...0001-Fix-typecast-warning-with-clang.patch | 32 --------------- ...mon.c-fix-a-formatting-error-with-cl.patch | 40 ------------------- ...{nfs-utils_2.8.2.bb => nfs-utils_2.8.3.bb} | 4 +- 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-typecast-warning-with-clang.patch delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.8.2.bb => nfs-utils_2.8.3.bb} (96%) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-typecast-warning-with-clang.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-typecast-warning-with-clang.patch deleted file mode 100644 index f493a3051e..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-typecast-warning-with-clang.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0a64c5ad17786796d84390e480a38b4f762229ae Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 18 Dec 2024 19:20:39 -0800 -Subject: [PATCH v2] Fix typecast warning with clang - -Fixes -file.c:200:8: error: assigning to 'char *' from 'const char *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] - -Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=173463533411103&w=2] -Signed-off-by: Khem Raj -Cc: Benjamin Coddington -Cc: Steve Dickson ---- -v2: Make base as const char pointer insread of trying type punning - - support/nsm/file.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/support/nsm/file.c b/support/nsm/file.c -index de122b0f..68f99bf0 100644 ---- a/support/nsm/file.c -+++ b/support/nsm/file.c -@@ -184,7 +184,8 @@ static char * - nsm_make_temp_pathname(const char *pathname) - { - size_t size; -- char *path, *base; -+ char *path; -+ const char *base; - int len; - - size = strlen(pathname) + sizeof(".new") + 1; diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch deleted file mode 100644 index a99ba284e0..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cc59a7fe15b6ca2ee43cba0dc1d699323b36ffcc Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 21 Mar 2025 10:42:56 +0100 -Subject: [PATCH] support/nfs/xcommon.c: fix a formatting error with clang - -Specifically, this happens: - -| xcommon.c:101:24: error: format string is not a string literal [-Werror,-Wformat-nonliteral] -| 101 | vfprintf (stderr, fmt2, args); -| | ^~~~ - -A similar approach (print \n seprately) is already used elsewhere in -the same file. - -Upstream-Status: Submitted [via email to steved@redhat.com,linux-nfs@vger.kernel.org] -Signed-off-by: Alexander Kanavin ---- - support/nfs/xcommon.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c -index 3989f0b..1d04dd1 100644 ---- a/support/nfs/xcommon.c -+++ b/support/nfs/xcommon.c -@@ -94,13 +94,11 @@ xstrconcat4 (const char *s, const char *t, const char *u, const char *v) { - void - nfs_error (const char *fmt, ...) { - va_list args; -- char *fmt2; - -- fmt2 = xstrconcat2 (fmt, "\n"); - va_start (args, fmt); -- vfprintf (stderr, fmt2, args); -+ vfprintf (stderr, fmt, args); -+ fprintf (stderr, "\n"); - va_end (args); -- free (fmt2); - } - - /* Make a canonical pathname from PATH. Returns a freshly malloced string. diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb similarity index 96% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb index 1f3afa0560..9668ac0e86 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb @@ -22,13 +22,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfsserver \ file://nfscommon \ file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ - file://0001-Fix-typecast-warning-with-clang.patch \ file://0004-Use-nogroup-for-nobody-group.patch \ file://0005-find-OE-provided-Kerberos.patch \ - file://0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch \ " -SRC_URI[sha256sum] = "a39bbea76ac0ab9e6e8699caf3c308b6b310c20d458e8fa8606196d358e7fb15" +SRC_URI[sha256sum] = "11e7c5847a8423a72931c865bd9296e7fd56ff270a795a849183900961711725" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies.