This has been already submitted, and the usage patch should be dropped instead of rebased.
Ross On 10 July 2018 at 03:42, Hong Liu <[email protected]> wrote: > Upgrade file from 5.32 to 5.33 > > Signed-off-by: Hong Liu <[email protected]> > --- > .../file/file/0001-Add-P-prompt-into-Usage-info.patch | 14 > ++++++++------ > meta/recipes-devtools/file/{file_5.32.bb => file_5.33.bb} | 2 +- > 2 files changed, 9 insertions(+), 7 deletions(-) > rename meta/recipes-devtools/file/{file_5.32.bb => file_5.33.bb} (96%) > > 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 8a16b2c..0d12d86 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 > @@ -23,16 +23,18 @@ 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 > +@@ -87,9 +87,8 @@ int getopt_long(int, char * const *, const char *, > + > # define USAGE \ > - "Usage: %s [" FILE_FLAGS \ > - "] [--apple] [--extension] [--mime-encoding] [--mime-type]\n" \ > -- " [-e testname] [-F separator] [-f namefile] [-m magicfiles] > " \ > -- "file ...\n" \ > + "Usage: %s [-" FILE_FLAGS "] [--apple] [--extension] > [--mime-encoding]\n" \ > +- " [--mime-type] [-e <testname>] [-F <separator>] " \ > +- " [-f <namefile>]\n" \ > +- " [-m <magicfiles>] [-P <parameter=value>] <file> ...\n" \ > + " [-e testname] [-F separator] [-f namefile] [-m > magicfiles]\n " \ > + " [-P parameter=limits] file ...\n" \ > - " %s -C [-m magicfiles]\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 > similarity index 96% > rename from meta/recipes-devtools/file/file_5.32.bb > rename to meta/recipes-devtools/file/file_5.33.bb > index 5e15925..c1688ff 100644 > --- a/meta/recipes-devtools/file/file_5.32.bb > +++ b/meta/recipes-devtools/file/file_5.33.bb > @@ -19,7 +19,7 @@ SRC_URI = "git://github.com/file/file.git \ > file://0001-Add-P-prompt-into-Usage-info.patch \ > " > > -SRCREV = "d474e35513940dbca039b510b4de705b44f5bd9c" > +SRCREV = "d14511987263ae3c6f5ad28ed7b81c26afdb422c" > S = "${WORKDIR}/git" > > inherit autotools > -- > 2.7.4 > > > > -- > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
