summaryrefslogtreecommitdiffstats
path: root/recipes-devtools/mtools/mtools
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-devtools/mtools/mtools')
-rw-r--r--recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch34
-rw-r--r--recipes-devtools/mtools/mtools/fix-broken-lz.patch23
-rw-r--r--recipes-devtools/mtools/mtools/mtools-makeinfo.patch65
-rw-r--r--recipes-devtools/mtools/mtools/mtools.patch129
-rw-r--r--recipes-devtools/mtools/mtools/no-x11.patch21
5 files changed, 272 insertions, 0 deletions
diff --git a/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch b/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch
new file mode 100644
index 0000000..1f8f835
--- /dev/null
+++ b/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch
@@ -0,0 +1,34 @@
1From 5cc8d1f96ab6d3459e13631d8356f87381562352 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 2 Jun 2016 09:49:44 +0300
4Subject: [PATCH] Continue even if fs size is not divisible by
5 sectors-per-track
6
7Filesystem with a size that is not divisible by sectors-per-track is
8not broken or invalid: it might be unoptimized on media where
9heads and cylinders actually matter but that should be it.
10
11Preserve the warning but make mtools continue even if fs size is not
12divisible by sectors-per-track.
13
14Upstream-Status: Submitted [info-mtools@gnu.org]
15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16---
17 init.c | 1 -
18 1 file changed, 1 deletion(-)
19
20diff --git a/init.c b/init.c
21index c9152e0..4e16a01 100644
22--- a/init.c
23+++ b/init.c
24@@ -338,7 +338,6 @@ Stream_t *fs_init(char drive, int mode, int *isRop)
25 fprintf(stderr,
26 "Add mtools_skip_check=1 to your .mtoolsrc file "
27 "to skip this test\n");
28- exit(1);
29 }
30
31 /* full cylinder buffering */
32--
332.1.4
34
diff --git a/recipes-devtools/mtools/mtools/fix-broken-lz.patch b/recipes-devtools/mtools/mtools/fix-broken-lz.patch
new file mode 100644
index 0000000..cb45491
--- /dev/null
+++ b/recipes-devtools/mtools/mtools/fix-broken-lz.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Backport
2
3Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
4Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
5---
6 Makefile.in | 1 +
7 1 file changed, 1 insertion(+)
8
9diff --git a/Makefile.in b/Makefile.in
10index 8f9305a..694e837 100644
11--- a/Makefile.in
12+++ b/Makefile.in
13@@ -251,6 +251,7 @@ install-scripts: ${DESTDIR}$(bindir)/mtools
14 @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
15 @for j in $(SCRIPTS) ; do \
16 $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
17+ $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
18 echo ${DESTDIR}$(bindir)/$$j ; \
19 done
20 rm -f ${DESTDIR}$(bindir)/lz
21--
222.0.0
23
diff --git a/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
new file mode 100644
index 0000000..2e2873a
--- /dev/null
+++ b/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
@@ -0,0 +1,65 @@
1Upstream-Status: Inappropriate [licensing]
2
3--- mtools-3.9.9/configure.in.orig 2006-04-14 16:05:54.337655192 -0600
4+++ mtools-3.9.9/configure.in 2006-04-14 16:12:29.736545424 -0600
5@@ -21,6 +21,33 @@
6 AC_C_CONST
7 AC_C_INLINE
8
9+AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
10+if test "x$MAKEINFO" = "x"; then
11+ MAKEINFO="@echo makeinfo missing; true"
12+fi
13+AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, )
14+if test "x$TEXI2DVI" = "x"; then
15+ TEXI2DVI="@echo texi2dvi missing; true"
16+fi
17+AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, )
18+if test "x$TEXI2PDF" = "x"; then
19+ TEXI2PDF="@echo texi2pdf missing; true"
20+fi
21+AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, )
22+if test "x$TEXI2HTML" = "x"; then
23+ TEXI2HTML="@echo texi2html missing; true"
24+fi
25+AC_CHECK_PROG(DVI2PS, dvi2ps, dvi2ps, )
26+if test "x$DVI2PS" = "x"; then
27+ DVI2PS="@echo dvi2ps missing; true"
28+fi
29+
30+AC_SUBST(MAKEINFO)
31+AC_SUBST(TEXI2DVI)
32+AC_SUBST(TEXI2PDF)
33+AC_SUBST(TEXI2HTML)
34+AC_SUBST(DVI2PS)
35+
36
37 dnl Check for configuration options
38 dnl Enable OS/2 extended density format disks
39--- mtools-3.9.9/Makefile.in.sav 2006-04-14 15:56:19.000000000 -0600
40+++ mtools-3.9.9/Makefile.in 2006-04-14 16:15:29.315245312 -0600
41@@ -11,10 +11,11 @@
42 USERLDFLAGS =
43 USERLDLIBS =
44
45-MAKEINFO = makeinfo
46-TEXI2DVI = texi2dvi
47-TEXI2PDF = texi2pdf
48-TEXI2HTML = texi2html
49+MAKEINFO = @MAKEINFO@
50+TEXI2DVI = @TEXI2DVI@
51+TEXI2PDF = @TEXI2PDF@
52+TEXI2HTML = @TEXI2HTML@
53+DVI2PS = @DVI2PS@
54
55
56 # do not edit below this line
57@@ -181,7 +182,7 @@
58
59 ps: mtools.ps
60 %.ps: %.dvi
61- dvips -f < $< > $@
62+ $(DVI2PS) -f < $< > $@
63
64 pdf: mtools.pdf
65 %.pdf: %.texi
diff --git a/recipes-devtools/mtools/mtools/mtools.patch b/recipes-devtools/mtools/mtools/mtools.patch
new file mode 100644
index 0000000..15a3208
--- /dev/null
+++ b/recipes-devtools/mtools/mtools/mtools.patch
@@ -0,0 +1,129 @@
1$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
2
3---
4 Makefile.in | 74 ++++++++++++++++++++++++++----------------------------------
5 1 file changed, 33 insertions(+), 41 deletions(-)
6
7Upstream-Status: Inappropriate [licensing]
8
9Index: mtools-3.9.9/Makefile.in
10===================================================================
11--- mtools-3.9.9.orig/Makefile.in 2007-10-12 11:18:46.000000000 +0100
12+++ mtools-3.9.9/Makefile.in 2007-10-12 11:28:14.000000000 +0100
13@@ -195,30 +195,22 @@ html: mtools.html mtools_toc.html
14
15 # Don't cd, to avoid breaking install-sh references.
16 install-info: info
17- $(top_srcdir)/mkinstalldirs $(infodir)
18+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir)
19 if test -f mtools.info; then \
20 for i in mtools.info*; do \
21- $(INSTALL_DATA) $$i $(infodir)/$$i; \
22+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
23 done; \
24 else \
25 for i in $(srcdir)/mtools.info*; do \
26- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
27+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
28 done; \
29 fi; \
30- if [ -n "$(INSTALL_INFO)" ] ; then \
31- if [ -f $(infodir)/dir.info ] ; then \
32- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
33- fi; \
34- if [ -f $(infodir)/dir ] ; then \
35- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
36- fi; \
37- fi
38
39 uninstall-info:
40 cd $(infodir) && rm -f mtools.info*
41
42-install: $(bindir)/mtools @BINFLOPPYD@ install-man install-links \
43- $(bindir)/mkmanifest install-scripts install-info
44+install: ${DESTDIR}$(bindir)/mtools ${DESTDIR}$(bindir)/floppyd install-man install-links \
45+ ${DESTDIR}$(bindir)/mkmanifest install-scripts install-info
46
47 uninstall: uninstall-bin uninstall-man uninstall-links \
48 uninstall-scripts
49@@ -228,52 +220,52 @@ distclean: clean texclean
50 maintainer-clean: distclean
51
52
53-$(bindir)/floppyd: floppyd
54- $(top_srcdir)/mkinstalldirs $(bindir)
55- $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd
56+${DESTDIR}$(bindir)/floppyd: floppyd
57+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
58+ $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd
59
60-$(bindir)/floppyd_installtest: floppyd_installtest
61- $(top_srcdir)/mkinstalldirs $(bindir)
62- $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
63+${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest
64+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
65+ $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest
66
67-$(bindir)/mtools: mtools
68- $(top_srcdir)/mkinstalldirs $(bindir)
69- $(INSTALL_PROGRAM) mtools $(bindir)/mtools
70+${DESTDIR}$(bindir)/mtools: mtools
71+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
72+ $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools
73
74-$(bindir)/mkmanifest: mkmanifest
75- $(top_srcdir)/mkinstalldirs $(bindir)
76- $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
77+${DESTDIR}$(bindir)/mkmanifest: mkmanifest
78+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
79+ $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest
80
81 #$(ETCDIR)/mtools: mtools.etc
82 # cp mtools.etc $(ETCDIR)/mtools
83
84-install-links: $(bindir)/mtools
85+install-links: ${DESTDIR}$(bindir)/mtools
86 @for j in $(LINKS); do \
87- rm -f $(bindir)/$$j ; \
88- $(LN_S) mtools $(bindir)/$$j ; \
89- echo $(bindir)/$$j ; \
90+ rm -f ${DESTDIR}$(bindir)/$$j ; \
91+ $(LN_S) mtools ${DESTDIR}$(bindir)/$$j ; \
92+ echo ${DESTDIR}$(bindir)/$$j ; \
93 done
94
95 ## "z" is the older version of "gz"; the name is just *too* short
96-install-scripts: $(bindir)/mtools
97- @$(top_srcdir)/mkinstalldirs $(bindir)
98+install-scripts: ${DESTDIR}$(bindir)/mtools
99+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
100 @for j in $(SCRIPTS) ; do \
101- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
102- echo $(bindir)/$$j ; \
103+ $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
104+ echo ${DESTDIR}$(bindir)/$$j ; \
105 done
106- rm -f $(bindir)/lz
107- $(LN_S) uz $(bindir)/lz
108+ rm -f ${DESTDIR}$(bindir)/lz
109+ $(LN_S) uz ${DESTDIR}$(bindir)/lz
110
111 install-man:
112- @$(top_srcdir)/mkinstalldirs $(MAN1DIR)
113+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN1DIR)
114 @for j in $(MAN1); do \
115- $(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \
116- echo $(MAN1DIR)/$$j ; \
117+ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN1DIR)/$$j ; \
118+ echo ${DESTDIR}$(MAN1DIR)/$$j ; \
119 done
120- @$(top_srcdir)/mkinstalldirs $(MAN5DIR)
121+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN5DIR)
122 @for j in $(MAN5); do \
123- $(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \
124- echo $(MAN5DIR)/$$j ; \
125+ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN5DIR)/$$j ; \
126+ echo ${DESTDIR}$(MAN5DIR)/$$j ; \
127 done
128
129 uninstall-bin:
diff --git a/recipes-devtools/mtools/mtools/no-x11.patch b/recipes-devtools/mtools/mtools/no-x11.patch
new file mode 100644
index 0000000..705b629
--- /dev/null
+++ b/recipes-devtools/mtools/mtools/no-x11.patch
@@ -0,0 +1,21 @@
1---
2 Makefile.in | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5Upstream-Status: Inappropriate [licensing]
6
7--- mtools-3.9.9.orig/Makefile.in
8+++ mtools-3.9.9/Makefile.in
9@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
10 X_PRE_LIBS = @X_PRE_LIBS@
11 CFLAGS = $(CPPFLAGS) $(DEFS) $(MYCFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS)
12 CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS)
13 LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@
14 ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS)
15-X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXau -lX11 $(LIBS)
16+X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(LIBS)
17 X_CCFLAGS = $(X_CFLAGS) $(CFLAGS)
18
19 all: mtools $(LINKS) mkmanifest @FLOPPYD@
20
21 %.o: %.c
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-26 09:49:05 +0000