mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 18:49:32 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
9b894b9f96
commit
5def5381b6
@@ -1,4 +1,4 @@
|
|||||||
From c61a3df892ba88d9f3f84c1844481457a04b051f Mon Sep 17 00:00:00 2001
|
From 9590860ba35cbd524cec51bdd009f0c63a7dd417 Mon Sep 17 00:00:00 2001
|
||||||
From: Ed Bartosh <ed.bartosh@linux.intel.com>
|
From: Ed Bartosh <ed.bartosh@linux.intel.com>
|
||||||
Date: Tue, 13 Jun 2017 14:55:52 +0300
|
Date: Tue, 13 Jun 2017 14:55:52 +0300
|
||||||
Subject: [PATCH] Disabled reading host configs.
|
Subject: [PATCH] Disabled reading host configs.
|
||||||
@@ -12,10 +12,10 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|||||||
1 file changed, 8 deletions(-)
|
1 file changed, 8 deletions(-)
|
||||||
|
|
||||||
diff --git a/config.c b/config.c
|
diff --git a/config.c b/config.c
|
||||||
index 46af755..5ed9114 100644
|
index 415755f..b61a49d 100644
|
||||||
--- a/config.c
|
--- a/config.c
|
||||||
+++ b/config.c
|
+++ b/config.c
|
||||||
@@ -737,14 +737,6 @@ void read_config(void)
|
@@ -774,14 +774,6 @@ void read_config(void)
|
||||||
memcpy(devices, const_devices,
|
memcpy(devices, const_devices,
|
||||||
nr_const_devices*sizeof(struct device));
|
nr_const_devices*sizeof(struct device));
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,48 @@
|
|||||||
|
From 3cf56b36db78679273f61ba78fbbf7f3fab52f68 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marcin Juszkiewicz <hrw@openedhand.com>
|
||||||
|
Date: Fri, 8 Jun 2007 08:35:12 +0000
|
||||||
|
Subject: [PATCH] mtools: imported from OE
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [licensing]
|
Upstream-Status: Inappropriate [licensing]
|
||||||
|
|
||||||
Index: mtools-4.0.18/configure.in
|
---
|
||||||
===================================================================
|
Makefile.in | 11 ++++++-----
|
||||||
--- mtools-4.0.18.orig/configure.in
|
configure.in | 27 +++++++++++++++++++++++++++
|
||||||
+++ mtools-4.0.18/configure.in
|
2 files changed, 33 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile.in b/Makefile.in
|
||||||
|
index 616d59f..85b5b1d 100644
|
||||||
|
--- a/Makefile.in
|
||||||
|
+++ b/Makefile.in
|
||||||
|
@@ -26,10 +26,11 @@ USERCFLAGS =
|
||||||
|
USERLDFLAGS =
|
||||||
|
USERLDLIBS =
|
||||||
|
|
||||||
|
-MAKEINFO = makeinfo
|
||||||
|
-TEXI2DVI = texi2dvi
|
||||||
|
-TEXI2PDF = texi2pdf
|
||||||
|
-TEXI2HTML = texi2html
|
||||||
|
+MAKEINFO = @MAKEINFO@
|
||||||
|
+TEXI2DVI = @TEXI2DVI@
|
||||||
|
+TEXI2PDF = @TEXI2PDF@
|
||||||
|
+TEXI2HTML = @TEXI2HTML@
|
||||||
|
+DVI2PS = @DVI2PS@
|
||||||
|
|
||||||
|
|
||||||
|
# do not edit below this line
|
||||||
|
@@ -199,7 +200,7 @@ dvi: mtools.dvi
|
||||||
|
|
||||||
|
ps: mtools.ps
|
||||||
|
%.ps: %.dvi
|
||||||
|
- dvips -f < $< > $@
|
||||||
|
+ $(DVI2PS) -f < $< > $@
|
||||||
|
|
||||||
|
pdf: mtools.pdf
|
||||||
|
%.pdf: %.texi sysconfdir.texi
|
||||||
|
diff --git a/configure.in b/configure.in
|
||||||
|
index 5ff75c1..c0f7440 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM
|
@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
AC_C_INLINE
|
AC_C_INLINE
|
||||||
@@ -35,35 +74,6 @@ Index: mtools-4.0.18/configure.in
|
|||||||
+AC_SUBST(TEXI2HTML)
|
+AC_SUBST(TEXI2HTML)
|
||||||
+AC_SUBST(DVI2PS)
|
+AC_SUBST(DVI2PS)
|
||||||
+
|
+
|
||||||
|
|
||||||
dnl Check for configuration options
|
dnl Check for configuration options
|
||||||
dnl Enable OS/2 extended density format disks
|
dnl Enable OS/2 extended density format disks
|
||||||
Index: mtools-4.0.18/Makefile.in
|
AC_ARG_ENABLE(xdf,
|
||||||
===================================================================
|
|
||||||
--- mtools-4.0.18.orig/Makefile.in
|
|
||||||
+++ mtools-4.0.18/Makefile.in
|
|
||||||
@@ -26,10 +26,11 @@ USERCFLAGS =
|
|
||||||
USERLDFLAGS =
|
|
||||||
USERLDLIBS =
|
|
||||||
|
|
||||||
-MAKEINFO = makeinfo
|
|
||||||
-TEXI2DVI = texi2dvi
|
|
||||||
-TEXI2PDF = texi2pdf
|
|
||||||
-TEXI2HTML = texi2html
|
|
||||||
+MAKEINFO = @MAKEINFO@
|
|
||||||
+TEXI2DVI = @TEXI2DVI@
|
|
||||||
+TEXI2PDF = @TEXI2PDF@
|
|
||||||
+TEXI2HTML = @TEXI2HTML@
|
|
||||||
+DVI2PS = @DVI2PS@
|
|
||||||
|
|
||||||
|
|
||||||
# do not edit below this line
|
|
||||||
@@ -198,7 +199,7 @@ dvi: mtools.dvi
|
|
||||||
|
|
||||||
ps: mtools.ps
|
|
||||||
%.ps: %.dvi
|
|
||||||
- dvips -f < $< > $@
|
|
||||||
+ $(DVI2PS) -f < $< > $@
|
|
||||||
|
|
||||||
pdf: mtools.pdf
|
|
||||||
%.pdf: %.texi sysconfdir.texi
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ RRECOMMENDS_${PN}_libc-glibc = "\
|
|||||||
glibc-gconv-ibm866 \
|
glibc-gconv-ibm866 \
|
||||||
glibc-gconv-ibm869 \
|
glibc-gconv-ibm869 \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "fd161eec3bb7a93d13936db67725ad3e17f2d5f4e6fa8f7667fbc7ac728e2c15"
|
SRC_URI[sha256sum] = "539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a"
|
||||||
|
|
||||||
SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
|
SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
|
||||||
file://mtools-makeinfo.patch \
|
file://mtools-makeinfo.patch \
|
||||||
Reference in New Issue
Block a user