diff options
Diffstat (limited to 'external/poky/meta/recipes-devtools/mtools')
7 files changed, 258 insertions, 0 deletions
diff --git a/external/poky/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch b/external/poky/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch new file mode 100644 index 00000000..1f8f8351 --- /dev/null +++ b/external/poky/meta/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/external/poky/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch b/external/poky/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch new file mode 100644 index 00000000..47385a58 --- /dev/null +++ b/external/poky/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch @@ -0,0 +1,44 @@ +From 5bdbfe0a63fed48104b17412854b26ee2275869a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 22 Aug 2018 16:54:39 +0800 +Subject: [PATCH] remove LOCK_NB to use blocking request + +While invoking mtools frequently, the unblocking request +caused race issue. Here is an example of syslinux +[snip] +dd if=/dev/zero of=floppy.img bs=1024 count=144 +losetup /dev/loop1 floppy.img +mkdosfs /dev/loop1 +syslinux -i /dev/loop1 +|plain floppy: device "/proc/6351/fd/3" busy (Resource temporarily unavailable): +|Cannot initialize 'S:' +|Bad target s:/ldlinux.sys +[snip] + +The idea is from: +https://bugzilla.redhat.com/show_bug.cgi?id=1235016 +https://groups.google.com/a/chromium.org/forum/#!msg/chromium-os-dev/bRPUCFHoBTQ/ZjB8kjjx1vUJ + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + lockdev.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lockdev.h b/lockdev.h +index 4467bc2..5a135ad 100644 +--- a/lockdev.h ++++ b/lockdev.h +@@ -43,7 +43,7 @@ int lock_dev(int fd, int mode, struct device *dev) + return 0; + + #if (defined(HAVE_FLOCK) && defined (LOCK_EX) && defined(LOCK_NB)) +- if (flock(fd, (mode ? LOCK_EX : LOCK_SH)|LOCK_NB) < 0) ++ if (flock(fd, (mode ? LOCK_EX : LOCK_SH)) < 0) + #else /* FLOCK */ + + #if (defined(HAVE_LOCKF) && defined(F_TLOCK)) +-- +2.7.4 + diff --git a/external/poky/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch b/external/poky/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch new file mode 100644 index 00000000..6bb9d6a3 --- /dev/null +++ b/external/poky/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch @@ -0,0 +1,17 @@ +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; + #if defined __GNUC__ && defined __STDC__ + /* gcc -traditional doesn't have PACKED, UNUSED and NORETURN */ + # define PACKED __attribute__ ((packed)) +-# if __GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3 ++# if (__GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3) && !defined(__clang__) + /* gcc 2.6.3 doesn't have "unused" */ /* mool */ + # define UNUSED(x) x __attribute__ ((unused));x + # define UNUSEDP __attribute__ ((unused)) diff --git a/external/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/external/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch new file mode 100644 index 00000000..01455f10 --- /dev/null +++ b/external/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch @@ -0,0 +1,23 @@ +Disabled reading host configs. + +Upstream-Status: Inappropriate [native] + +Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> + +--- mtools-4.0.18/config.c.orig 2017-06-13 12:27:38.644000000 +0300 ++++ mtools-4.0.18/config.c 2017-06-13 12:28:47.576000000 +0300 +@@ -701,14 +701,6 @@ + memcpy(devices, const_devices, + nr_const_devices*sizeof(struct device)); + +- (void) ((parse(CONF_FILE,1) | +- parse(LOCAL_CONF_FILE,1) | +- parse(SYS_CONF_FILE,1)) || +- (parse(OLD_CONF_FILE,1) | +- parse(OLD_LOCAL_CONF_FILE,1))); +- /* the old-name configuration files only get executed if none of the +- * new-name config files were used */ +- + homedir = get_homedir(); + if ( homedir ){ + strncpy(conf_file, homedir, MAXPATHLEN ); diff --git a/external/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/external/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch new file mode 100644 index 00000000..8ceb0af1 --- /dev/null +++ b/external/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch @@ -0,0 +1,69 @@ +Upstream-Status: Inappropriate [licensing] + +Index: mtools-4.0.18/configure.in +=================================================================== +--- mtools-4.0.18.orig/configure.in ++++ mtools-4.0.18/configure.in +@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM + 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 +Index: mtools-4.0.18/Makefile.in +=================================================================== +--- 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 diff --git a/external/poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch b/external/poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch new file mode 100644 index 00000000..9cb3e39f --- /dev/null +++ b/external/poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch @@ -0,0 +1,18 @@ +Disable building with X11 support. + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Scott Garman <scott.a.garman@intel.com> + +diff -urN mtools-4.0.15.orig//Makefile.in mtools-4.0.15//Makefile.in +--- mtools-4.0.15.orig//Makefile.in 2010-10-17 08:41:09.000000000 -0700 ++++ mtools-4.0.15//Makefile.in 2010-11-23 13:59:49.258258374 -0800 +@@ -146,7 +146,7 @@ + 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) -lXau -lX11 $(LIBS) ++X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(LIBS) + X_CCFLAGS = $(X_CFLAGS) $(CFLAGS) + + all: mtools $(LINKS) mkmanifest @FLOPPYD@ mtools.1 mtools.5 diff --git a/external/poky/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/external/poky/meta/recipes-devtools/mtools/mtools_4.0.18.bb new file mode 100644 index 00000000..3c31aca3 --- /dev/null +++ b/external/poky/meta/recipes-devtools/mtools/mtools_4.0.18.bb @@ -0,0 +1,53 @@ +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 = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +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] = "a23646617546bf6ad56f061d8b283c85" +SRC_URI[sha256sum] = "59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85" + +SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ + file://mtools-makeinfo.patch \ + file://no-x11.gplv3.patch \ + file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \ + file://0001-remove-LOCK_NB-to-use-blocking-request.patch \ + file://clang_UNUSED.patch \ + " + +SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch" + +inherit autotools texinfo + +EXTRA_OECONF = "--without-x" + +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} +} |