diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2018-06-28 15:39:46 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-28 12:26:56 +0100 |
| commit | 02f8aff020762e77bf49587115f6b8fbc96296c9 (patch) | |
| tree | 7c667f8ba68cf3e8987d374cfa130e07570fd34b | |
| parent | 40a904bf8bc1279c3da0893c003f740f1d2066c2 (diff) | |
| download | openembedded-core-contrib-02f8aff020762e77bf49587115f6b8fbc96296c9.tar.gz | |
file: update to 5.33
Drop 0001-Add-P-prompt-into-Usage-info.patch since it is already fixed
upstream.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch | 39 | ||||
| -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 @@ -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 - 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).+)" 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 |