From patchwork Wed Jul 23 03:29:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jinfeng (CN)" X-Patchwork-Id: 67308 X-Patchwork-Delegate: steve@sakoman.com 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 9D003C83F25 for ; Wed, 23 Jul 2025 03:29:43 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.5877.1753241377244376341 for ; Tue, 22 Jul 2025 20:29:37 -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.178.238, mailfrom: prvs=9299fc1790=jinfeng.wang.cn@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.8/8.18.1.8) with ESMTP id 56N1qRCb1386999 for ; Wed, 23 Jul 2025 03:29:36 GMT 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 481vqu9ney-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 03:29:36 +0000 (GMT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) 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.57; Tue, 22 Jul 2025 20:29:22 -0700 Received: from pek-lpg-core4.wrs.com (128.224.153.44) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.57 via Frontend Transport; Tue, 22 Jul 2025 20:29:21 -0700 From: To: Subject: [scarthgap][PATCH 1/6] mtools: upgrade 4.0.43 -> 4.0.44 Date: Wed, 23 Jul 2025 11:29:28 +0800 Message-ID: <20250723032933.546382-1-jinfeng.wang.cn@windriver.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Proofpoint-GUID: dfxENwUekFL1_DONSjAf7PvM5UVq3vkj X-Proofpoint-ORIG-GUID: dfxENwUekFL1_DONSjAf7PvM5UVq3vkj X-Authority-Analysis: v=2.4 cv=AbqxH2XG c=1 sm=1 tr=0 ts=68805720 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=Wb1JkmetP80A:10 a=ag1SF4gXAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=QyXUC8HyAAAA:8 a=Js0LpgGrAAAA:8 a=uwSDW-MwkwuNUkEQg8AA:9 a=Yupwre4RP9_Eg_Bd0iYG:22 a=FdTzh2GWekK77mhwV6Dw:22 a=queAGc4so_Lf9sPBW2Va:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDAyNyBTYWx0ZWRfX40EebVHz5msm ztipqFK/wGvVlwSe3U8jge461oRLUgu818tYx5bmNg1p/YKXeAxESFUbnBnhoeo+2UrKI4VBdtX ALNLPU95+hSbGvBgAi74BMoN42PEPnCdUv0Eep4XGVHlnM5ZG2VgtkwpVd305mNTOAsTzNCqpKC qk+tS55gofjzBl2RvSFLuIEWZ0kLu2SAkm7CHWi7aoOfO4XfwN4bnCddjcSUxb9uJ0fFSqoeC8D BM9YnNqnWViCwWlOLXz7D2qm0NGI2IxVlYudM0pxk4bVjDFAK9A7v/7XHH2sA13xDcxg2eaEoVy PrYS0CK2EA0xGZKGLQoHqXfl6+9wY+oABwYG5wHOsyAaGylDitPB7TUp888D42dwZEZlQojuGKj owk+M8cp X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-23_01,2025-07-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 malwarescore=0 suspectscore=0 spamscore=0 phishscore=0 bulkscore=0 priorityscore=1501 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2507210000 definitions=main-2507210183 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, 23 Jul 2025 03:29:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/220779 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (From OE-Core rev: dd8c333576d7ebb8abab3a62b3451439519a0caa) Signed-off-by: Jinfeng Wang --- .../mtools/mtools/clang_UNUSED.patch | 19 +++++++++++++------ .../mtools/disable-hardcoded-configs.patch | 7 +++---- .../mtools/mtools/mtools-makeinfo.patch | 11 +++++------ .../{mtools_4.0.43.bb => mtools_4.0.44.bb} | 2 +- 4 files changed, 22 insertions(+), 17 deletions(-) rename meta/recipes-devtools/mtools/{mtools_4.0.43.bb => mtools_4.0.44.bb} (93%) diff --git a/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch index 6bb9d6a3da..20a6d1b8b3 100644 --- a/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch +++ b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch @@ -1,12 +1,19 @@ -Undefine UNUSED macros with clang +From c72d075cb0c3a65ef17621c7ed1ffac35ca3b68e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 19 Sep 2018 11:55:41 -0700 +Subject: [PATCH] Undefine UNUSED macros with clang Upstream-Status: Pending Signed-off-by: Khem Raj -Index: mtools-4.0.18/sysincludes.h -=================================================================== ---- mtools-4.0.18.orig/sysincludes.h -+++ mtools-4.0.18/sysincludes.h -@@ -101,7 +101,7 @@ typedef void *caddr_t; +--- + sysincludes.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysincludes.h b/sysincludes.h +index e16ab45..8d285d4 100644 +--- a/sysincludes.h ++++ b/sysincludes.h +@@ -98,7 +98,7 @@ typedef void *caddr_t; #if defined __GNUC__ && defined __STDC__ /* gcc -traditional doesn't have PACKED, UNUSED and NORETURN */ # define PACKED __attribute__ ((packed)) diff --git a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch index 57be935487..1bed4e7614 100644 --- a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch +++ b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch @@ -1,4 +1,4 @@ -From 2ef9b371a5cc44e730143e694d71665831fac216 Mon Sep 17 00:00:00 2001 +From 0953b744b0257e26c170fb6d6b4c0f6210e4ae43 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 13 Jun 2017 14:55:52 +0300 Subject: [PATCH] Disabled reading host configs. @@ -6,16 +6,15 @@ Subject: [PATCH] Disabled reading host configs. Upstream-Status: Inappropriate [native] Signed-off-by: Ed Bartosh - --- config.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config.c b/config.c -index 2f6a297..3181ed7 100644 +index 358282b..8ebafb4 100644 --- a/config.c +++ b/config.c -@@ -844,14 +844,6 @@ void read_config(void) +@@ -868,14 +868,6 @@ void read_config(void) memcpy(devices, const_devices, nr_const_devices*sizeof(struct device)); diff --git a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch index 6ae91d6cb9..3771f94c59 100644 --- a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch +++ b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch @@ -1,17 +1,16 @@ -From 3cf56b36db78679273f61ba78fbbf7f3fab52f68 Mon Sep 17 00:00:00 2001 +From 184b76e9742ff89f90a066edb0f46b4a150351cf Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 8 Jun 2007 08:35:12 +0000 Subject: [PATCH] mtools: imported from OE Upstream-Status: Inappropriate [licensing] - --- Makefile.in | 11 ++++++----- configure.in | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 616d59f..85b5b1d 100644 +index 5db50d7..92ad461 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,10 +26,11 @@ USERCFLAGS = @@ -30,7 +29,7 @@ index 616d59f..85b5b1d 100644 # do not edit below this line -@@ -199,7 +200,7 @@ dvi: mtools.dvi +@@ -185,7 +186,7 @@ dvi: mtools.dvi ps: mtools.ps %.ps: %.dvi @@ -40,10 +39,10 @@ index 616d59f..85b5b1d 100644 pdf: mtools.pdf %.pdf: %.texi sysconfdir.texi diff --git a/configure.in b/configure.in -index 5ff75c1..c0f7440 100644 +index 1de916e..fd6cb08 100644 --- a/configure.in +++ b/configure.in -@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM +@@ -32,6 +32,33 @@ AC_CANONICAL_TARGET AC_C_CONST AC_C_INLINE diff --git a/meta/recipes-devtools/mtools/mtools_4.0.43.bb b/meta/recipes-devtools/mtools/mtools_4.0.44.bb similarity index 93% rename from meta/recipes-devtools/mtools/mtools_4.0.43.bb rename to meta/recipes-devtools/mtools/mtools_4.0.44.bb index 859103979e..d8dd671be2 100644 --- a/meta/recipes-devtools/mtools/mtools_4.0.43.bb +++ b/meta/recipes-devtools/mtools/mtools_4.0.44.bb @@ -24,7 +24,7 @@ RRECOMMENDS:${PN}:libc-glibc = "\ glibc-gconv-ibm866 \ glibc-gconv-ibm869 \ " -SRC_URI[sha256sum] = "541e179665dc4e272b9602f2074243591a157da89cc47064da8c5829dbd2b339" +SRC_URI[sha256sum] = "37dc4df022533c3d4b2ec1c78973c27c7e8b585374c2d46ab64c6a3db31eddb8" SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://mtools-makeinfo.patch \