From 91db51363b3cf78a7b908ea4a548ab9658150661 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Wed, 24 Jun 2015 01:55:19 -0700
Subject: file: 5.22 -> 5.23

Updated 0001-Add-P-prompt-into-Usage-info.patch.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../file/0001-Add-P-prompt-into-Usage-info.patch   |  6 ++--
 meta/recipes-devtools/file/file_5.22.bb            | 36 ----------------------
 meta/recipes-devtools/file/file_5.23.bb            | 36 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-devtools/file/file_5.22.bb
 create mode 100644 meta/recipes-devtools/file/file_5.23.bb

diff --git a/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch b/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
index 95e1291f66..8a16b2cf73 100644
--- a/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
+++ b/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
@@ -20,16 +20,16 @@ Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/file.c b/src/file.c
-index 546fd8b..beef868 100644
+index 2b15e21..e5a957b 100644
 --- a/src/file.c
 +++ b/src/file.c
 @@ -76,8 +76,8 @@ int getopt_long(int argc, char * const *argv, const char *optstring, const struc
  # define USAGE  \
      "Usage: %s [" FILE_FLAGS \
- 	"] [--apple] [--mime-encoding] [--mime-type]\n" \
+ 	"] [--apple] [--extension] [--mime-encoding] [--mime-type]\n" \
 -    "            [-e testname] [-F separator] [-f namefile] [-m magicfiles] " \
 -    "file ...\n" \
-+    "            [-e testname] [-F separator] [-f namefile] [-m magicfiles]\n" \
++    "            [-e testname] [-F separator] [-f namefile] [-m magicfiles]\n " \
 +    "            [-P parameter=limits] file ...\n" \
      "       %s -C [-m magicfiles]\n" \
      "       %s [--help]\n"
diff --git a/meta/recipes-devtools/file/file_5.22.bb b/meta/recipes-devtools/file/file_5.22.bb
deleted file mode 100644
index e8d4dae4f8..0000000000
--- a/meta/recipes-devtools/file/file_5.22.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "File classification tool"
-DESCRIPTION = "File attempts to classify files depending \
-on their contents and prints a description if a match is found."
-HOMEPAGE = "http://www.darwinsys.com/file/"
-SECTION = "console/utils"
-
-# two clause BSD
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"
-
-DEPENDS = "zlib file-native"
-DEPENDS_class-native = "zlib-native"
-
-SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
-	   file://debian-742262.patch \
-	   file://0001-Add-P-prompt-into-Usage-info.patch \
-          "
-
-SRC_URI[md5sum] = "8fb13e5259fe447e02c4a37bc7225add"
-SRC_URI[sha256sum] = "c4e3a8e44cb888c5e4b476e738503e37fb9de3b25a38c143e214bfc12109fc0b"
-
-inherit autotools
-
-FILES_${PN} += "${datadir}/misc/*.mgc"
-
-do_install_append_class-native() {
-	create_cmdline_wrapper ${D}/${bindir}/file \
-		--magic-file ${datadir}/misc/magic.mgc
-}
-
-do_install_append_class-nativesdk() {
-	create_cmdline_wrapper ${D}/${bindir}/file \
-		--magic-file ${datadir}/misc/magic.mgc
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/file/file_5.23.bb b/meta/recipes-devtools/file/file_5.23.bb
new file mode 100644
index 0000000000..d71f29056c
--- /dev/null
+++ b/meta/recipes-devtools/file/file_5.23.bb
@@ -0,0 +1,36 @@
+SUMMARY = "File classification tool"
+DESCRIPTION = "File attempts to classify files depending \
+on their contents and prints a description if a match is found."
+HOMEPAGE = "http://www.darwinsys.com/file/"
+SECTION = "console/utils"
+
+# two clause BSD
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"
+
+DEPENDS = "zlib file-native"
+DEPENDS_class-native = "zlib-native"
+
+SRC_URI = "ftp://ftp.astron.com/pub/file/${BP}.tar.gz \
+	   file://debian-742262.patch \
+	   file://0001-Add-P-prompt-into-Usage-info.patch \
+          "
+
+SRC_URI[md5sum] = "61db35209ce71a6d576392ce6e1d2f80"
+SRC_URI[sha256sum] = "2c8ab3ff143e2cdfb5ecee381752f80a79e0b4cfe9ca4cc6e1c3e5ec15e6157c"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/misc/*.mgc"
+
+do_install_append_class-native() {
+	create_cmdline_wrapper ${D}/${bindir}/file \
+		--magic-file ${datadir}/misc/magic.mgc
+}
+
+do_install_append_class-nativesdk() {
+	create_cmdline_wrapper ${D}/${bindir}/file \
+		--magic-file ${datadir}/misc/magic.mgc
+}
+
+BBCLASSEXTEND = "native nativesdk"
-- 
cgit 1.2.3-korg