summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2025-03-04 17:08:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-06 11:16:47 +0000
commit59dfc9962fe4d7b9beeea910009be5b18d977494 (patch)
tree6292d660d4b3316165d678482d50735588ea46a5 /meta
parent71dc87b404d60fcdbf99ddf816afb6a9b677d813 (diff)
downloadpoky-59dfc9962fe4d7b9beeea910009be5b18d977494.tar.gz
mtools: upgrade 4.0.47 -> 4.0.48
clang_UNUSED.patch disable-hardcoded-configs.patch refreshed for 4.0.48 (From OE-Core rev: 1d5aee7e67cd614073a15b47b832375428865260) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch6
-rw-r--r--meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch6
-rw-r--r--meta/recipes-devtools/mtools/mtools_4.0.48.bb (renamed from meta/recipes-devtools/mtools/mtools_4.0.47.bb)2
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch
index 2f3c452420..ddf3706f51 100644
--- a/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch
+++ b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch
@@ -1,4 +1,4 @@
1From d8e9cf472f49c8dbb3b0855145974d199a83e8a4 Mon Sep 17 00:00:00 2001 1From 6914c6e15cd15daf1dae81458e5346958c9d5449 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 19 Sep 2018 11:55:41 -0700 3Date: Wed, 19 Sep 2018 11:55:41 -0700
4Subject: [PATCH] Undefine UNUSED macros with clang 4Subject: [PATCH] Undefine UNUSED macros with clang
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/sysincludes.h b/sysincludes.h 12diff --git a/sysincludes.h b/sysincludes.h
13index 6b322ff..48daecd 100644 13index 272b316..49ee5ae 100644
14--- a/sysincludes.h 14--- a/sysincludes.h
15+++ b/sysincludes.h 15+++ b/sysincludes.h
16@@ -85,7 +85,7 @@ ac_cv_func_setpgrp_void=yes ../mtools/configure --build=i386-linux-gnu --host=i3 16@@ -98,7 +98,7 @@ ac_cv_func_setpgrp_void=yes ../mtools/configure --build=i386-linux-gnu --host=i3
17 #if defined __GNUC__ && defined __STDC__ 17 #if defined __GNUC__ && defined __STDC__
18 /* gcc -traditional doesn't have PACKED, UNUSED and NORETURN */ 18 /* gcc -traditional doesn't have PACKED, UNUSED and NORETURN */
19 # define PACKED __attribute__ ((packed)) 19 # 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 1b3c3e003d..63992ac547 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 @@
1From 4e51cf33fc34e8e82661b9bc3ab13858a2ffe43d Mon Sep 17 00:00:00 2001 1From 16969d42ec6514883bcee87cc89b3e7864481d7e Mon Sep 17 00:00:00 2001
2From: Ed Bartosh <ed.bartosh@linux.intel.com> 2From: Ed Bartosh <ed.bartosh@linux.intel.com>
3Date: Tue, 13 Jun 2017 14:55:52 +0300 3Date: Tue, 13 Jun 2017 14:55:52 +0300
4Subject: [PATCH] Disabled reading host configs. 4Subject: [PATCH] Disabled reading host configs.
@@ -11,10 +11,10 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
11 1 file changed, 8 deletions(-) 11 1 file changed, 8 deletions(-)
12 12
13diff --git a/config.c b/config.c 13diff --git a/config.c b/config.c
14index 436c94b..794f098 100644 14index 2433457..3972150 100644
15--- a/config.c 15--- a/config.c
16+++ b/config.c 16+++ b/config.c
17@@ -868,14 +868,6 @@ void read_config(void) 17@@ -849,14 +849,6 @@ void read_config(void)
18 memcpy(devices, const_devices, 18 memcpy(devices, const_devices,
19 nr_const_devices*sizeof(struct device)); 19 nr_const_devices*sizeof(struct device));
20 20
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.47.bb b/meta/recipes-devtools/mtools/mtools_4.0.48.bb
index 70d6579621..646735f3b3 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.47.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.48.bb
@@ -24,7 +24,7 @@ RRECOMMENDS:${PN}:libc-glibc = "\
24 glibc-gconv-ibm866 \ 24 glibc-gconv-ibm866 \
25 glibc-gconv-ibm869 \ 25 glibc-gconv-ibm869 \
26 " 26 "
27SRC_URI[sha256sum] = "31aa06078cc3f50591b95e71a909c56dd179d87e9cbdc07bf435e595bd7cc7ff" 27SRC_URI[sha256sum] = "03c29aac8735dd7154a989fbc29eaf2b506121ae1c3a35cd0bf2a02e94d271a9"
28 28
29SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ 29SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
30 file://mtools-makeinfo.patch \ 30 file://mtools-makeinfo.patch \