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>
This commit is contained in:
Yi Zhao
2018-06-28 15:39:46 +08:00
committed by Richard Purdie
parent c7c64baa41
commit 65da09ad88
2 changed files with 1 additions and 41 deletions

View File

@@ -1,39 +0,0 @@
From 08abf944b2bff27b6dd325dd15b4861cebef113a Mon Sep 17 00:00:00 2001
From: Junling Zheng <zhengjunling@huawei.com>
Date: Wed, 8 Apr 2015 03:26:57 +0000
Subject: [PATCH] Add -P prompt into Usage info
Currently, Usage info doesn't include -P prompt, add it:
root@arma9el:~# file
Usage: file [-bcEhikLlNnprsvz0] [--apple] [--mime-encoding] [--mime-type]
[-e testname] [-F separator] [-f namefile] [-m magicfiles]
[-P parameter=limits] file ...
file -C [-m magicfiles]
file [--help]
Upstream-Status: Submitted
Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
---
src/file.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/file.c b/src/file.c
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] [--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 " \
+ " [-P parameter=limits] file ...\n" \
" %s -C [-m magicfiles]\n" \
" %s [--help]\n"
--
1.8.3.4

View File

@@ -16,10 +16,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)"
SRC_URI = "git://github.com/file/file.git \
file://debian-742262.patch \
file://0001-Add-P-prompt-into-Usage-info.patch \
"
SRCREV = "d474e35513940dbca039b510b4de705b44f5bd9c"
SRCREV = "219846094c7593e27453e62855e61181089c48cf"
S = "${WORKDIR}/git"
inherit autotools