summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-06-28 15:39:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-29 11:07:44 +0100
commit65da09ad88b5307fc53f089318ffeec21bc934bc (patch)
treec839f260844bd8448db2f32ab512eeafe3acc7f0 /meta
parentc7c64baa411fd96886918c235b851ae3e5a6a61f (diff)
downloadpoky-65da09ad88b5307fc53f089318ffeec21bc934bc.tar.gz
file: update to 5.33
Drop 0001-Add-P-prompt-into-Usage-info.patch since it is already fixed upstream. (From OE-Core rev: 02f8aff020762e77bf49587115f6b8fbc96296c9) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch39
-rw-r--r--meta/recipes-devtools/file/file_5.33.bb (renamed from meta/recipes-devtools/file/file_5.32.bb)3
2 files changed, 1 insertions, 41 deletions
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
deleted file mode 100644
index 8a16b2cf73..0000000000
--- a/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 08abf944b2bff27b6dd325dd15b4861cebef113a Mon Sep 17 00:00:00 2001
2From: Junling Zheng <zhengjunling@huawei.com>
3Date: Wed, 8 Apr 2015 03:26:57 +0000
4Subject: [PATCH] Add -P prompt into Usage info
5
6Currently, Usage info doesn't include -P prompt, add it:
7
8root@arma9el:~# file
9Usage: file [-bcEhikLlNnprsvz0] [--apple] [--mime-encoding] [--mime-type]
10 [-e testname] [-F separator] [-f namefile] [-m magicfiles]
11 [-P parameter=limits] file ...
12 file -C [-m magicfiles]
13 file [--help]
14
15Upstream-Status: Submitted
16
17Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
18---
19 src/file.c | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/src/file.c b/src/file.c
23index 2b15e21..e5a957b 100644
24--- a/src/file.c
25+++ b/src/file.c
26@@ -76,8 +76,8 @@ int getopt_long(int argc, char * const *argv, const char *optstring, const struc
27 # define USAGE \
28 "Usage: %s [" FILE_FLAGS \
29 "] [--apple] [--extension] [--mime-encoding] [--mime-type]\n" \
30- " [-e testname] [-F separator] [-f namefile] [-m magicfiles] " \
31- "file ...\n" \
32+ " [-e testname] [-F separator] [-f namefile] [-m magicfiles]\n " \
33+ " [-P parameter=limits] file ...\n" \
34 " %s -C [-m magicfiles]\n" \
35 " %s [--help]\n"
36
37--
381.8.3.4
39
diff --git a/meta/recipes-devtools/file/file_5.32.bb b/meta/recipes-devtools/file/file_5.33.bb
index 5e15925126..4126422b38 100644
--- a/meta/recipes-devtools/file/file_5.32.bb
+++ b/meta/recipes-devtools/file/file_5.33.bb
@@ -16,10 +16,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)"
16 16
17SRC_URI = "git://github.com/file/file.git \ 17SRC_URI = "git://github.com/file/file.git \
18 file://debian-742262.patch \ 18 file://debian-742262.patch \
19 file://0001-Add-P-prompt-into-Usage-info.patch \
20 " 19 "
21 20
22SRCREV = "d474e35513940dbca039b510b4de705b44f5bd9c" 21SRCREV = "219846094c7593e27453e62855e61181089c48cf"
23S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
24 23
25inherit autotools 24inherit autotools