From f08f09accc124162e7538595694868d307c59649 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 15 Oct 2018 21:11:52 -0700 Subject: [PATCH] mtools: upgrade 4.0.18 -> 4.0.19 Signed-off-by: Richard Purdie --- .../mtools/disable-hardcoded-configs.patch | 17 +++++++++++++---- .../{mtools_4.0.18.bb => mtools_4.0.19.bb} | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) rename meta/recipes-devtools/mtools/{mtools_4.0.18.bb => mtools_4.0.19.bb} (91%) 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 @@ -Disabled reading host configs. +From 5c24356762bc4274d3ca4930b0bc7754f4ffd19b 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. Upstream-Status: Inappropriate [native] Signed-off-by: Ed Bartosh ---- mtools-4.0.18/config.c.orig 2017-06-13 12:27:38.644000000 +0300 -+++ mtools-4.0.18/config.c 2017-06-13 12:28:47.576000000 +0300 -@@ -701,14 +701,6 @@ +--- + config.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/config.c b/config.c +index f086883..1c3f9bd 100644 +--- a/config.c ++++ b/config.c +@@ -701,14 +701,6 @@ void read_config(void) memcpy(devices, const_devices, nr_const_devices*sizeof(struct device)); diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.19.bb similarity index 91% rename from meta/recipes-devtools/mtools/mtools_4.0.18.bb rename to 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 = "\ glibc-gconv-ibm866 \ glibc-gconv-ibm869 \ " -SRC_URI[md5sum] = "a23646617546bf6ad56f061d8b283c85" -SRC_URI[sha256sum] = "59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85" +SRC_URI[md5sum] = "f750246a65ee6f9d2e82d10b03a0aaaf" +SRC_URI[sha256sum] = "1bc197199ea1c2c317f597879486eeb817f3199b526d94cc6841624768d910df" SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://mtools-makeinfo.patch \ -- 2.40.1