summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-15 21:11:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-19 17:03:24 +0000
commit94520c7790f92b84509dd424f810b56ef8cc47fb (patch)
tree9d61bb2e94b967541f105e71ca1f69cabe906203 /meta
parent4d64e87ce341459666f0bb5e3e764e3345709237 (diff)
downloadpoky-94520c7790f92b84509dd424f810b56ef8cc47fb.tar.gz
mtools: upgrade 4.0.18 -> 4.0.19
(From OE-Core rev: f08f09accc124162e7538595694868d307c59649) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch17
-rw-r--r--meta/recipes-devtools/mtools/mtools_4.0.19.bb (renamed from meta/recipes-devtools/mtools/mtools_4.0.18.bb)4
2 files changed, 15 insertions, 6 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
index 01455f1012..464ccc4ca7 100644
--- a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
+++ b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
@@ -1,12 +1,21 @@
1Disabled reading host configs. 1From 5c24356762bc4274d3ca4930b0bc7754f4ffd19b Mon Sep 17 00:00:00 2001
2From: Ed Bartosh <ed.bartosh@linux.intel.com>
3Date: Tue, 13 Jun 2017 14:55:52 +0300
4Subject: [PATCH] Disabled reading host configs.
2 5
3Upstream-Status: Inappropriate [native] 6Upstream-Status: Inappropriate [native]
4 7
5Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> 8Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
6 9
7--- mtools-4.0.18/config.c.orig 2017-06-13 12:27:38.644000000 +0300 10---
8+++ mtools-4.0.18/config.c 2017-06-13 12:28:47.576000000 +0300 11 config.c | 8 --------
9@@ -701,14 +701,6 @@ 12 1 file changed, 8 deletions(-)
13
14diff --git a/config.c b/config.c
15index f086883..1c3f9bd 100644
16--- a/config.c
17+++ b/config.c
18@@ -701,14 +701,6 @@ void read_config(void)
10 memcpy(devices, const_devices, 19 memcpy(devices, const_devices,
11 nr_const_devices*sizeof(struct device)); 20 nr_const_devices*sizeof(struct device));
12 21
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.19.bb
index 3c31aca3ad..09742773e0 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.19.bb
@@ -24,8 +24,8 @@ 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] = "a23646617546bf6ad56f061d8b283c85" 27SRC_URI[md5sum] = "f750246a65ee6f9d2e82d10b03a0aaaf"
28SRC_URI[sha256sum] = "59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85" 28SRC_URI[sha256sum] = "1bc197199ea1c2c317f597879486eeb817f3199b526d94cc6841624768d910df"
29 29
30SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ 30SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
31 file://mtools-makeinfo.patch \ 31 file://mtools-makeinfo.patch \