summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-12-28 21:04:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-31 11:53:26 +0000
commit5def5381b66163613fa71d788de41d0eb753bf2a (patch)
tree5f3c9ead2a4a8cc82c6ccbfac95b82809d5ffa6b
parent9b894b9f963467a23ef07aded85d1cd424120d0f (diff)
downloadpoky-5def5381b66163613fa71d788de41d0eb753bf2a.tar.gz
mtools: update 4.0.25 -> 4.0.26
(From OE-Core rev: b9089247a2cd42bbf7a973d21d3dc999ebd1e89c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch6
-rw-r--r--meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch78
-rw-r--r--meta/recipes-devtools/mtools/mtools_4.0.26.bb (renamed from meta/recipes-devtools/mtools/mtools_4.0.25.bb)2
3 files changed, 48 insertions, 38 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
index 4705890157..f187487096 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 c61a3df892ba88d9f3f84c1844481457a04b051f Mon Sep 17 00:00:00 2001 1From 9590860ba35cbd524cec51bdd009f0c63a7dd417 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 46af755..5ed9114 100644 15index 415755f..b61a49d 100644
16--- a/config.c 16--- a/config.c
17+++ b/config.c 17+++ b/config.c
18@@ -737,14 +737,6 @@ void read_config(void) 18@@ -774,14 +774,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/mtools-makeinfo.patch b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
index 8ceb0af136..6ae91d6cb9 100644
--- a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
+++ b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
@@ -1,9 +1,48 @@
1From 3cf56b36db78679273f61ba78fbbf7f3fab52f68 Mon Sep 17 00:00:00 2001
2From: Marcin Juszkiewicz <hrw@openedhand.com>
3Date: Fri, 8 Jun 2007 08:35:12 +0000
4Subject: [PATCH] mtools: imported from OE
5
1Upstream-Status: Inappropriate [licensing] 6Upstream-Status: Inappropriate [licensing]
2 7
3Index: mtools-4.0.18/configure.in 8---
4=================================================================== 9 Makefile.in | 11 ++++++-----
5--- mtools-4.0.18.orig/configure.in 10 configure.in | 27 +++++++++++++++++++++++++++
6+++ mtools-4.0.18/configure.in 11 2 files changed, 33 insertions(+), 5 deletions(-)
12
13diff --git a/Makefile.in b/Makefile.in
14index 616d59f..85b5b1d 100644
15--- a/Makefile.in
16+++ b/Makefile.in
17@@ -26,10 +26,11 @@ USERCFLAGS =
18 USERLDFLAGS =
19 USERLDLIBS =
20
21-MAKEINFO = makeinfo
22-TEXI2DVI = texi2dvi
23-TEXI2PDF = texi2pdf
24-TEXI2HTML = texi2html
25+MAKEINFO = @MAKEINFO@
26+TEXI2DVI = @TEXI2DVI@
27+TEXI2PDF = @TEXI2PDF@
28+TEXI2HTML = @TEXI2HTML@
29+DVI2PS = @DVI2PS@
30
31
32 # do not edit below this line
33@@ -199,7 +200,7 @@ dvi: mtools.dvi
34
35 ps: mtools.ps
36 %.ps: %.dvi
37- dvips -f < $< > $@
38+ $(DVI2PS) -f < $< > $@
39
40 pdf: mtools.pdf
41 %.pdf: %.texi sysconfdir.texi
42diff --git a/configure.in b/configure.in
43index 5ff75c1..c0f7440 100644
44--- a/configure.in
45+++ b/configure.in
7@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM 46@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM
8 AC_C_CONST 47 AC_C_CONST
9 AC_C_INLINE 48 AC_C_INLINE
@@ -35,35 +74,6 @@ Index: mtools-4.0.18/configure.in
35+AC_SUBST(TEXI2HTML) 74+AC_SUBST(TEXI2HTML)
36+AC_SUBST(DVI2PS) 75+AC_SUBST(DVI2PS)
37+ 76+
38
39 dnl Check for configuration options 77 dnl Check for configuration options
40 dnl Enable OS/2 extended density format disks 78 dnl Enable OS/2 extended density format disks
41Index: mtools-4.0.18/Makefile.in 79 AC_ARG_ENABLE(xdf,
42===================================================================
43--- mtools-4.0.18.orig/Makefile.in
44+++ mtools-4.0.18/Makefile.in
45@@ -26,10 +26,11 @@ USERCFLAGS =
46 USERLDFLAGS =
47 USERLDLIBS =
48
49-MAKEINFO = makeinfo
50-TEXI2DVI = texi2dvi
51-TEXI2PDF = texi2pdf
52-TEXI2HTML = texi2html
53+MAKEINFO = @MAKEINFO@
54+TEXI2DVI = @TEXI2DVI@
55+TEXI2PDF = @TEXI2PDF@
56+TEXI2HTML = @TEXI2HTML@
57+DVI2PS = @DVI2PS@
58
59
60 # do not edit below this line
61@@ -198,7 +199,7 @@ dvi: mtools.dvi
62
63 ps: mtools.ps
64 %.ps: %.dvi
65- dvips -f < $< > $@
66+ $(DVI2PS) -f < $< > $@
67
68 pdf: mtools.pdf
69 %.pdf: %.texi sysconfdir.texi
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.25.bb b/meta/recipes-devtools/mtools/mtools_4.0.26.bb
index bca33a28ee..4938713065 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.25.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.26.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] = "fd161eec3bb7a93d13936db67725ad3e17f2d5f4e6fa8f7667fbc7ac728e2c15" 27SRC_URI[sha256sum] = "539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a"
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 \