From patchwork Thu Aug 22 09:35:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 48096 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 EBD24C5321D for ; Thu, 22 Aug 2024 09:35:40 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web11.9393.1724319340443930669 for ; Thu, 22 Aug 2024 02:35:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=P3UwYSgE; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5bf006f37daso985207a12.1 for ; Thu, 22 Aug 2024 02:35:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724319339; x=1724924139; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+akNvl74Yrp9T6Is2d6vrJtd3syXO8aFzqvB3DeShPQ=; b=P3UwYSgEC41pUeDOljy3LWMSBvIXF4eD3d6CfDAP6r/wkH1lY1HqQieO8trC0B/UVF RYLbO232mpALY+MlGuB1D5SlAA3ID/t6UmphVu/bGlCZCsqXI6kvvQEle0jC8kOCRTaO jkDqFJU8ilJxwYPv8B65v2+5/SkyjOc8x7/kAe8ZEeWMxQQCiNMLV9KRhdob2IPp4y4P LBcleIS16On3ruqCjUa+NrmmF2LULRUuI9O/Cs7LTKeLkZRFB3+eRrQ7JIuNZj0q3MXR 69HNaVZWy6x9H3hrG6hHMPpTfDf2jQS1l+Lwc34u3M8pAMykY8jeGu0oCVDsHfO0p4lJ M7aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724319339; x=1724924139; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+akNvl74Yrp9T6Is2d6vrJtd3syXO8aFzqvB3DeShPQ=; b=ksIW/hzXiNi/gWj+CpYFlEGB9+ZS4uar37SJ0Sb9P038prO4tLRkWbjYKZV1FFYeIK Z/1KAvw36uiLySRmUhQNL8fPSoJnWM3ie5WUEIluCWdKMhdGcwoh8Jv8EmvJ9x4Jv5j/ GQOL02wn0fgL0us01ubetk+lhMedFrKFgT5F5p/74RxTUEqBNRrpcEZmhJcGTWWivzr8 6TRY6mhvzw3r4CLzp6XSaA0pFfuJEi9I9P2vGSjrZVz32i5KdNmDw5qj98Y4FfhHE1AK OXO37GKGvnJlhIN+qLuHejh/TP7dQNdhH5LOCVTHZMX6KVOLEF3DXf0uLpOHHO1HtEPw B7+A== X-Gm-Message-State: AOJu0Yy/8phTkro4gSdjWrvXKy6UQvoORAQYrP2NaYq/N7ODng/JzUGk xf/pSN4uj26X9HQw+yJu61SEb4Ij94D7MNDEBQT0EHnkz7qGcZwqBU7Swg== X-Google-Smtp-Source: AGHT+IEBy4TX4e0UEmffs3Xe7v9iUTR5joBIV+za1ZBZxs8LzY29XpvJe+4SurQpR0SoYWJgHz8xPw== X-Received: by 2002:a05:6402:388d:b0:5be:fcf3:ed91 with SMTP id 4fb4d7f45d1cf-5bf2c04be1cmr2270640a12.13.1724319338495; Thu, 22 Aug 2024 02:35:38 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c044ddbce5sm698502a12.4.2024.08.22.02.35.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2024 02:35:38 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 21/32] mtools: upgrade 4.0.43 -> 4.0.44 Date: Thu, 22 Aug 2024 11:35:10 +0200 Message-Id: <20240822093521.36790-21-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240822093521.36790-1-alex.kanavin@gmail.com> References: <20240822093521.36790-1-alex.kanavin@gmail.com> 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 ; Thu, 22 Aug 2024 09:35:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203636 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../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 6bb9d6a3dae..20a6d1b8b35 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 57be9354870..1bed4e76147 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 6ae91d6cb9b..3771f94c591 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 859103979ef..d8dd671be26 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 \