From 09f5db4581cc412204f1407be9eba36c1af7376c Mon Sep 17 00:00:00 2001
From: Scott Garman <scott.a.garman@intel.com>
Date: Wed, 15 Jun 2011 20:04:05 -0700
Subject: mtools: upgrade to v4.0.16

Also added Upstream-Status: tag to a patch.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 .../mtools/mtools/no-x11.gplv3.patch                |  9 ++++++---
 meta/recipes-devtools/mtools/mtools_4.0.15.bb       | 21 ---------------------
 meta/recipes-devtools/mtools/mtools_4.0.16.bb       | 21 +++++++++++++++++++++
 3 files changed, 27 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-devtools/mtools/mtools_4.0.15.bb
 create mode 100644 meta/recipes-devtools/mtools/mtools_4.0.16.bb

(limited to 'meta')

diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch b/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
index 7d1f54591..9cb3e39f5 100644
--- a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
+++ b/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
@@ -1,6 +1,9 @@
-# Disable building with X11 support.
-#
-# Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+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
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.15.bb b/meta/recipes-devtools/mtools/mtools_4.0.15.bb
deleted file mode 100644
index 08f42cc91..000000000
--- a/meta/recipes-devtools/mtools/mtools_4.0.15.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-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"
-
-PR = "r0"
-
-SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
-           file://mtools-makeinfo.patch \
-           file://no-x11.gplv3.patch"
-
-SRC_URI[md5sum] = "b7550b649af77812cb696a780e853f47"
-SRC_URI[sha256sum] = "290defca107cc183a17c98d3f7d00db02228b724084a2a818f1dd6ea86973899"
-
-inherit autotools
-
-EXTRA_OECONF = "--without-x"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.16.bb b/meta/recipes-devtools/mtools/mtools_4.0.16.bb
new file mode 100644
index 000000000..f5dca2672
--- /dev/null
+++ b/meta/recipes-devtools/mtools/mtools_4.0.16.bb
@@ -0,0 +1,21 @@
+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"
+
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
+           file://mtools-makeinfo.patch \
+           file://no-x11.gplv3.patch"
+
+SRC_URI[md5sum] = "e9b07f35272210f407012abaf5d1b9b5"
+SRC_URI[sha256sum] = "7c9e337786d142399d37202ff2002f95bfb3f4e96620223a18d7206708ad2ed5"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-x"
+
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3