diff options
-rw-r--r-- | meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/mtools/mtools_4.0.47.bb (renamed from meta/recipes-devtools/mtools/mtools_4.0.46.bb) | 2 |
4 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 1420d84b86..2f3c452420 100644 --- a/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch +++ b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6654edfb1eee416b58bcb6490658f80071a353c2 Mon Sep 17 00:00:00 2001 | 1 | From d8e9cf472f49c8dbb3b0855145974d199a83e8a4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 19 Sep 2018 11:55:41 -0700 | 3 | Date: Wed, 19 Sep 2018 11:55:41 -0700 |
4 | Subject: [PATCH] Undefine UNUSED macros with clang | 4 | Subject: [PATCH] Undefine UNUSED macros with clang |
diff --git a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch index 1bed4e7614..1b3c3e003d 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 @@ | |||
1 | From 0953b744b0257e26c170fb6d6b4c0f6210e4ae43 Mon Sep 17 00:00:00 2001 | 1 | From 4e51cf33fc34e8e82661b9bc3ab13858a2ffe43d Mon Sep 17 00:00:00 2001 |
2 | From: Ed Bartosh <ed.bartosh@linux.intel.com> | 2 | From: Ed Bartosh <ed.bartosh@linux.intel.com> |
3 | Date: Tue, 13 Jun 2017 14:55:52 +0300 | 3 | Date: Tue, 13 Jun 2017 14:55:52 +0300 |
4 | Subject: [PATCH] Disabled reading host configs. | 4 | Subject: [PATCH] Disabled reading host configs. |
@@ -11,7 +11,7 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> | |||
11 | 1 file changed, 8 deletions(-) | 11 | 1 file changed, 8 deletions(-) |
12 | 12 | ||
13 | diff --git a/config.c b/config.c | 13 | diff --git a/config.c b/config.c |
14 | index 358282b..8ebafb4 100644 | 14 | index 436c94b..794f098 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 | @@ -868,14 +868,6 @@ void read_config(void) |
diff --git a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch index 8c80040f91..fb7ba56eec 100644 --- a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch +++ b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From fd1e84c66852c2c906ee292aad942b4bfbd9e306 Mon Sep 17 00:00:00 2001 | 1 | From b517158e8ffc6a665506007b20708d6c2589cec1 Mon Sep 17 00:00:00 2001 |
2 | From: Marcin Juszkiewicz <hrw@openedhand.com> | 2 | From: Marcin Juszkiewicz <hrw@openedhand.com> |
3 | Date: Fri, 8 Jun 2007 08:35:12 +0000 | 3 | Date: Fri, 8 Jun 2007 08:35:12 +0000 |
4 | Subject: [PATCH] mtools: imported from OE | 4 | Subject: [PATCH] mtools: imported from OE |
@@ -39,10 +39,10 @@ index 7b305b0..70c8c74 100644 | |||
39 | pdf: mtools.pdf | 39 | pdf: mtools.pdf |
40 | %.pdf: %.texi sysconfdir.texi | 40 | %.pdf: %.texi sysconfdir.texi |
41 | diff --git a/configure.ac b/configure.ac | 41 | diff --git a/configure.ac b/configure.ac |
42 | index de108a8..0fd9ef0 100644 | 42 | index 37f0d00..c93cfb5 100644 |
43 | --- a/configure.ac | 43 | --- a/configure.ac |
44 | +++ b/configure.ac | 44 | +++ b/configure.ac |
45 | @@ -33,6 +33,33 @@ AC_CANONICAL_TARGET | 45 | @@ -36,6 +36,33 @@ AC_PATH_PROG(INSTALL_INFO, install-info, "") |
46 | AC_C_CONST | 46 | AC_C_CONST |
47 | AC_C_INLINE | 47 | AC_C_INLINE |
48 | 48 | ||
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.46.bb b/meta/recipes-devtools/mtools/mtools_4.0.47.bb index 1173718662..70d6579621 100644 --- a/meta/recipes-devtools/mtools/mtools_4.0.46.bb +++ b/meta/recipes-devtools/mtools/mtools_4.0.47.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 | " |
27 | SRC_URI[sha256sum] = "9aad8dd859f88fb7787924ec47590192d3abf7bad6c840509c854290d6bc16c0" | 27 | SRC_URI[sha256sum] = "31aa06078cc3f50591b95e71a909c56dd179d87e9cbdc07bf435e595bd7cc7ff" |
28 | 28 | ||
29 | SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ | 29 | SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ |
30 | file://mtools-makeinfo.patch \ | 30 | file://mtools-makeinfo.patch \ |