mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
mtools: upgrade 4.0.43 -> 4.0.44
(From OE-Core rev: b09b06ed6351685e5351f8bf80a88d2f42093ca4) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (From OE-Core rev: dd8c333576d7ebb8abab3a62b3451439519a0caa) Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
0bc339e2fc
commit
93663dc300
@@ -1,12 +1,19 @@
|
||||
Undefine UNUSED macros with clang
|
||||
From c72d075cb0c3a65ef17621c7ed1ffac35ca3b68e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 19 Sep 2018 11:55:41 -0700
|
||||
Subject: [PATCH] Undefine UNUSED macros with clang
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Index: mtools-4.0.18/sysincludes.h
|
||||
===================================================================
|
||||
--- mtools-4.0.18.orig/sysincludes.h
|
||||
+++ mtools-4.0.18/sysincludes.h
|
||||
@@ -101,7 +101,7 @@ typedef void *caddr_t;
|
||||
---
|
||||
sysincludes.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sysincludes.h b/sysincludes.h
|
||||
index e16ab45..8d285d4 100644
|
||||
--- a/sysincludes.h
|
||||
+++ b/sysincludes.h
|
||||
@@ -98,7 +98,7 @@ typedef void *caddr_t;
|
||||
#if defined __GNUC__ && defined __STDC__
|
||||
/* gcc -traditional doesn't have PACKED, UNUSED and NORETURN */
|
||||
# define PACKED __attribute__ ((packed))
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2ef9b371a5cc44e730143e694d71665831fac216 Mon Sep 17 00:00:00 2001
|
||||
From 0953b744b0257e26c170fb6d6b4c0f6210e4ae43 Mon Sep 17 00:00:00 2001
|
||||
From: Ed Bartosh <ed.bartosh@linux.intel.com>
|
||||
Date: Tue, 13 Jun 2017 14:55:52 +0300
|
||||
Subject: [PATCH] Disabled reading host configs.
|
||||
@@ -6,16 +6,15 @@ Subject: [PATCH] Disabled reading host configs.
|
||||
Upstream-Status: Inappropriate [native]
|
||||
|
||||
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
||||
|
||||
---
|
||||
config.c | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/config.c b/config.c
|
||||
index 2f6a297..3181ed7 100644
|
||||
index 358282b..8ebafb4 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -844,14 +844,6 @@ void read_config(void)
|
||||
@@ -868,14 +868,6 @@ void read_config(void)
|
||||
memcpy(devices, const_devices,
|
||||
nr_const_devices*sizeof(struct device));
|
||||
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
From 3cf56b36db78679273f61ba78fbbf7f3fab52f68 Mon Sep 17 00:00:00 2001
|
||||
From 184b76e9742ff89f90a066edb0f46b4a150351cf 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]
|
||||
|
||||
---
|
||||
Makefile.in | 11 ++++++-----
|
||||
configure.in | 27 +++++++++++++++++++++++++++
|
||||
2 files changed, 33 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 616d59f..85b5b1d 100644
|
||||
index 5db50d7..92ad461 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -26,10 +26,11 @@ USERCFLAGS =
|
||||
@@ -30,7 +29,7 @@ index 616d59f..85b5b1d 100644
|
||||
|
||||
|
||||
# do not edit below this line
|
||||
@@ -199,7 +200,7 @@ dvi: mtools.dvi
|
||||
@@ -185,7 +186,7 @@ dvi: mtools.dvi
|
||||
|
||||
ps: mtools.ps
|
||||
%.ps: %.dvi
|
||||
@@ -40,10 +39,10 @@ index 616d59f..85b5b1d 100644
|
||||
pdf: mtools.pdf
|
||||
%.pdf: %.texi sysconfdir.texi
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 5ff75c1..c0f7440 100644
|
||||
index 1de916e..fd6cb08 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM
|
||||
@@ -32,6 +32,33 @@ AC_CANONICAL_TARGET
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ RRECOMMENDS:${PN}:libc-glibc = "\
|
||||
glibc-gconv-ibm866 \
|
||||
glibc-gconv-ibm869 \
|
||||
"
|
||||
SRC_URI[sha256sum] = "541e179665dc4e272b9602f2074243591a157da89cc47064da8c5829dbd2b339"
|
||||
SRC_URI[sha256sum] = "37dc4df022533c3d4b2ec1c78973c27c7e8b585374c2d46ab64c6a3db31eddb8"
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
|
||||
file://mtools-makeinfo.patch \
|
||||
Reference in New Issue
Block a user