summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-11-02 17:48:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-03 08:21:12 +0000
commit12be61d63d0182682678af3ea2f461de117bb1fa (patch)
treebe4a25f5c32eb0201df2b5a79ccb301173671241 /meta
parent2cf8d92f44c25a15fdb0c1f1ea2aa5473e0c529e (diff)
downloadpoky-12be61d63d0182682678af3ea2f461de117bb1fa.tar.gz
mtools: upgrade 4.0.24 -> 4.0.25
(From OE-Core rev: f3a389990035d4a93136479120c2a2ab94cf5664) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch6
-rw-r--r--meta/recipes-devtools/mtools/mtools_4.0.25.bb (renamed from meta/recipes-devtools/mtools/mtools_4.0.24.bb)3
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
index 138ff9de76..4705890157 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 fa6ebd96c7f330edcd74abf61584592eabb9e726 Mon Sep 17 00:00:00 2001 1From c61a3df892ba88d9f3f84c1844481457a04b051f 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.
@@ -12,10 +12,10 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
12 1 file changed, 8 deletions(-) 12 1 file changed, 8 deletions(-)
13 13
14diff --git a/config.c b/config.c 14diff --git a/config.c b/config.c
15index 265d494..15e64dd 100644 15index 46af755..5ed9114 100644
16--- a/config.c 16--- a/config.c
17+++ b/config.c 17+++ b/config.c
18@@ -740,14 +740,6 @@ void read_config(void) 18@@ -737,14 +737,6 @@ void read_config(void)
19 memcpy(devices, const_devices, 19 memcpy(devices, const_devices,
20 nr_const_devices*sizeof(struct device)); 20 nr_const_devices*sizeof(struct device));
21 21
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.24.bb b/meta/recipes-devtools/mtools/mtools_4.0.25.bb
index f11cdad37a..bca33a28ee 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.24.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.25.bb
@@ -24,8 +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[md5sum] = "aeaf34406e9d28922b7c09a35ca5955e" 27SRC_URI[sha256sum] = "fd161eec3bb7a93d13936db67725ad3e17f2d5f4e6fa8f7667fbc7ac728e2c15"
28SRC_URI[sha256sum] = "24f4a2da9219f98498eb1b340cd96db7ef9b684c067d1bdeb6e85efdd13b2fb9"
29 28
30SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ 29SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
31 file://mtools-makeinfo.patch \ 30 file://mtools-makeinfo.patch \