aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-devtools/mtools
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-devtools/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
-rw-r--r--recipes-devtools/mtools/mtools_3.9.9.bb55
6 files changed, 327 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 @@
+From 5cc8d1f96ab6d3459e13631d8356f87381562352 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Thu, 2 Jun 2016 09:49:44 +0300
+Subject: [PATCH] Continue even if fs size is not divisible by
+ sectors-per-track
+
+Filesystem with a size that is not divisible by sectors-per-track is
+not broken or invalid: it might be unoptimized on media where
+heads and cylinders actually matter but that should be it.
+
+Preserve the warning but make mtools continue even if fs size is not
+divisible by sectors-per-track.
+
+Upstream-Status: Submitted [info-mtools@gnu.org]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ init.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/init.c b/init.c
+index c9152e0..4e16a01 100644
+--- a/init.c
++++ b/init.c
+@@ -338,7 +338,6 @@ Stream_t *fs_init(char drive, int mode, int *isRop)
+ fprintf(stderr,
+ "Add mtools_skip_check=1 to your .mtoolsrc file "
+ "to skip this test\n");
+- exit(1);
+ }
+
+ /* full cylinder buffering */
+--
+2.1.4
+
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 @@
+Upstream-Status: Backport
+
+Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8f9305a..694e837 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -251,6 +251,7 @@ install-scripts: ${DESTDIR}$(bindir)/mtools
+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ @for j in $(SCRIPTS) ; do \
+ $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
++ $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
+ echo ${DESTDIR}$(bindir)/$$j ; \
+ done
+ rm -f ${DESTDIR}$(bindir)/lz
+--
+2.0.0
+
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 @@
+Upstream-Status: Inappropriate [licensing]
+
+--- mtools-3.9.9/configure.in.orig 2006-04-14 16:05:54.337655192 -0600
++++ mtools-3.9.9/configure.in 2006-04-14 16:12:29.736545424 -0600
+@@ -21,6 +21,33 @@
+ AC_C_CONST
+ AC_C_INLINE
+
++AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
++if test "x$MAKEINFO" = "x"; then
++ MAKEINFO="@echo makeinfo missing; true"
++fi
++AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, )
++if test "x$TEXI2DVI" = "x"; then
++ TEXI2DVI="@echo texi2dvi missing; true"
++fi
++AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, )
++if test "x$TEXI2PDF" = "x"; then
++ TEXI2PDF="@echo texi2pdf missing; true"
++fi
++AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, )
++if test "x$TEXI2HTML" = "x"; then
++ TEXI2HTML="@echo texi2html missing; true"
++fi
++AC_CHECK_PROG(DVI2PS, dvi2ps, dvi2ps, )
++if test "x$DVI2PS" = "x"; then
++ DVI2PS="@echo dvi2ps missing; true"
++fi
++
++AC_SUBST(MAKEINFO)
++AC_SUBST(TEXI2DVI)
++AC_SUBST(TEXI2PDF)
++AC_SUBST(TEXI2HTML)
++AC_SUBST(DVI2PS)
++
+
+ dnl Check for configuration options
+ dnl Enable OS/2 extended density format disks
+--- mtools-3.9.9/Makefile.in.sav 2006-04-14 15:56:19.000000000 -0600
++++ mtools-3.9.9/Makefile.in 2006-04-14 16:15:29.315245312 -0600
+@@ -11,10 +11,11 @@
+ 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
+@@ -181,7 +182,7 @@
+
+ ps: mtools.ps
+ %.ps: %.dvi
+- dvips -f < $< > $@
++ $(DVI2PS) -f < $< > $@
+
+ pdf: mtools.pdf
+ %.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 @@
+$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
+
+---
+ Makefile.in | 74 ++++++++++++++++++++++++++----------------------------------
+ 1 file changed, 33 insertions(+), 41 deletions(-)
+
+Upstream-Status: Inappropriate [licensing]
+
+Index: mtools-3.9.9/Makefile.in
+===================================================================
+--- mtools-3.9.9.orig/Makefile.in 2007-10-12 11:18:46.000000000 +0100
++++ mtools-3.9.9/Makefile.in 2007-10-12 11:28:14.000000000 +0100
+@@ -195,30 +195,22 @@ html: mtools.html mtools_toc.html
+
+ # Don't cd, to avoid breaking install-sh references.
+ install-info: info
+- $(top_srcdir)/mkinstalldirs $(infodir)
++ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir)
+ if test -f mtools.info; then \
+ for i in mtools.info*; do \
+- $(INSTALL_DATA) $$i $(infodir)/$$i; \
++ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
+ done; \
+ else \
+ for i in $(srcdir)/mtools.info*; do \
+- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
++ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
+ done; \
+ fi; \
+- if [ -n "$(INSTALL_INFO)" ] ; then \
+- if [ -f $(infodir)/dir.info ] ; then \
+- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
+- fi; \
+- if [ -f $(infodir)/dir ] ; then \
+- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
+- fi; \
+- fi
+
+ uninstall-info:
+ cd $(infodir) && rm -f mtools.info*
+
+-install: $(bindir)/mtools @BINFLOPPYD@ install-man install-links \
+- $(bindir)/mkmanifest install-scripts install-info
++install: ${DESTDIR}$(bindir)/mtools ${DESTDIR}$(bindir)/floppyd install-man install-links \
++ ${DESTDIR}$(bindir)/mkmanifest install-scripts install-info
+
+ uninstall: uninstall-bin uninstall-man uninstall-links \
+ uninstall-scripts
+@@ -228,52 +220,52 @@ distclean: clean texclean
+ maintainer-clean: distclean
+
+
+-$(bindir)/floppyd: floppyd
+- $(top_srcdir)/mkinstalldirs $(bindir)
+- $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd
++${DESTDIR}$(bindir)/floppyd: floppyd
++ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd
+
+-$(bindir)/floppyd_installtest: floppyd_installtest
+- $(top_srcdir)/mkinstalldirs $(bindir)
+- $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
++${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest
++ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest
+
+-$(bindir)/mtools: mtools
+- $(top_srcdir)/mkinstalldirs $(bindir)
+- $(INSTALL_PROGRAM) mtools $(bindir)/mtools
++${DESTDIR}$(bindir)/mtools: mtools
++ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools
+
+-$(bindir)/mkmanifest: mkmanifest
+- $(top_srcdir)/mkinstalldirs $(bindir)
+- $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
++${DESTDIR}$(bindir)/mkmanifest: mkmanifest
++ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest
+
+ #$(ETCDIR)/mtools: mtools.etc
+ # cp mtools.etc $(ETCDIR)/mtools
+
+-install-links: $(bindir)/mtools
++install-links: ${DESTDIR}$(bindir)/mtools
+ @for j in $(LINKS); do \
+- rm -f $(bindir)/$$j ; \
+- $(LN_S) mtools $(bindir)/$$j ; \
+- echo $(bindir)/$$j ; \
++ rm -f ${DESTDIR}$(bindir)/$$j ; \
++ $(LN_S) mtools ${DESTDIR}$(bindir)/$$j ; \
++ echo ${DESTDIR}$(bindir)/$$j ; \
+ done
+
+ ## "z" is the older version of "gz"; the name is just *too* short
+-install-scripts: $(bindir)/mtools
+- @$(top_srcdir)/mkinstalldirs $(bindir)
++install-scripts: ${DESTDIR}$(bindir)/mtools
++ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ @for j in $(SCRIPTS) ; do \
+- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
+- echo $(bindir)/$$j ; \
++ $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
++ echo ${DESTDIR}$(bindir)/$$j ; \
+ done
+- rm -f $(bindir)/lz
+- $(LN_S) uz $(bindir)/lz
++ rm -f ${DESTDIR}$(bindir)/lz
++ $(LN_S) uz ${DESTDIR}$(bindir)/lz
+
+ install-man:
+- @$(top_srcdir)/mkinstalldirs $(MAN1DIR)
++ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN1DIR)
+ @for j in $(MAN1); do \
+- $(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \
+- echo $(MAN1DIR)/$$j ; \
++ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN1DIR)/$$j ; \
++ echo ${DESTDIR}$(MAN1DIR)/$$j ; \
+ done
+- @$(top_srcdir)/mkinstalldirs $(MAN5DIR)
++ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN5DIR)
+ @for j in $(MAN5); do \
+- $(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \
+- echo $(MAN5DIR)/$$j ; \
++ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN5DIR)/$$j ; \
++ echo ${DESTDIR}$(MAN5DIR)/$$j ; \
+ done
+
+ 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 @@
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Upstream-Status: Inappropriate [licensing]
+
+--- mtools-3.9.9.orig/Makefile.in
++++ mtools-3.9.9/Makefile.in
+@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ CFLAGS = $(CPPFLAGS) $(DEFS) $(MYCFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS)
+ CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS)
+ LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@
+ ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS)
+-X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXau -lX11 $(LIBS)
++X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(LIBS)
+ X_CCFLAGS = $(X_CFLAGS) $(CFLAGS)
+
+ all: mtools $(LINKS) mkmanifest @FLOPPYD@
+
+ %.o: %.c
diff --git a/recipes-devtools/mtools/mtools_3.9.9.bb b/recipes-devtools/mtools/mtools_3.9.9.bb
new file mode 100644
index 0000000..2904ff4
--- /dev/null
+++ b/recipes-devtools/mtools/mtools_3.9.9.bb
@@ -0,0 +1,55 @@
+SUMMARY = "Utilities to access MS-DOS disks without mounting them"
+DESCRIPTION = "Mtools is a collection of utilities to access MS-DOS disks from GNU and Unix without mounting them."
+HOMEPAGE = "http://www.gnu.org/software/mtools/"
+SECTION = "optional"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=92b58ec77696788ce278b044d2a8e9d3"
+PR = "r6"
+
+DEPENDS += "virtual/libiconv"
+
+RDEPENDS_${PN}_libc-glibc = "glibc-gconv-ibm850"
+RRECOMMENDS_${PN}_libc-glibc = "\
+ glibc-gconv-ibm437 \
+ glibc-gconv-ibm737 \
+ glibc-gconv-ibm775 \
+ glibc-gconv-ibm851 \
+ glibc-gconv-ibm852 \
+ glibc-gconv-ibm855 \
+ glibc-gconv-ibm857 \
+ glibc-gconv-ibm860 \
+ glibc-gconv-ibm861 \
+ glibc-gconv-ibm862 \
+ glibc-gconv-ibm863 \
+ glibc-gconv-ibm865 \
+ glibc-gconv-ibm866 \
+ glibc-gconv-ibm869 \
+ "
+SRC_URI[md5sum] = "3e68b857b4e1f3a6521d1dfefbd30a36"
+SRC_URI[sha256sum] = "af083a73425d664d4607ef6c6564fd9319a0e47ee7c105259a45356cb834690e"
+
+#http://mtools.linux.lu/mtools-${PV}.tar.gz
+SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/mtools-${PV}.tar.gz \
+ file://mtools-makeinfo.patch \
+ file://mtools.patch \
+ file://no-x11.patch \
+ file://fix-broken-lz.patch \
+ file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \
+ "
+
+inherit autotools texinfo
+
+EXTRA_OECONF = "--without-x"
+
+LDFLAGS_append_libc-uclibc = " -liconv "
+
+BBCLASSEXTEND = "native nativesdk"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[libbsd] = "ac_cv_lib_bsd_main=yes,ac_cv_lib_bsd_main=no,libbsd"
+
+do_install_prepend () {
+ # Create bindir to fix parallel installation issues
+ mkdir -p ${D}/${bindir}
+ mkdir -p ${D}/${datadir}
+}