From 65da09ad88b5307fc53f089318ffeec21bc934bc Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 28 Jun 2018 15:39:46 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../file/0001-Add-P-prompt-into-Usage-info.patch | 39 ------------------ meta/recipes-devtools/file/file_5.32.bb | 48 ---------------------- meta/recipes-devtools/file/file_5.33.bb | 47 +++++++++++++++++++++ 3 files changed, 47 insertions(+), 87 deletions(-) delete mode 100644 meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch delete mode 100644 meta/recipes-devtools/file/file_5.32.bb create mode 100644 meta/recipes-devtools/file/file_5.33.bb (limited to 'meta/recipes-devtools') 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 -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 ---- - 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.32.bb deleted file mode 100644 index 5e15925126..0000000000 --- a/meta/recipes-devtools/file/file_5.32.bb +++ /dev/null @@ -1,48 +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-replacement-native" -DEPENDS_class-native = "zlib-native" - -# Blacklist a bogus tag in upstream check -UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P(?!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" -S = "${WORKDIR}/git" - -inherit autotools - -EXTRA_OEMAKE_append_class-target = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" -EXTRA_OEMAKE_append_class-nativesdk = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" - -CFLAGS_append = " -std=c99" - -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" -PROVIDES_append_class-native = " file-replacement-native" -# Don't use NATIVE_PACKAGE_PATH_SUFFIX as that hides libmagic from anyone who -# depends on file-replacement-native. -bindir_append_class-native = "/file-native" diff --git a/meta/recipes-devtools/file/file_5.33.bb b/meta/recipes-devtools/file/file_5.33.bb new file mode 100644 index 0000000000..4126422b38 --- /dev/null +++ b/meta/recipes-devtools/file/file_5.33.bb @@ -0,0 +1,47 @@ +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-replacement-native" +DEPENDS_class-native = "zlib-native" + +# Blacklist a bogus tag in upstream check +UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P(?!6_23).+)" + +SRC_URI = "git://github.com/file/file.git \ + file://debian-742262.patch \ + " + +SRCREV = "219846094c7593e27453e62855e61181089c48cf" +S = "${WORKDIR}/git" + +inherit autotools + +EXTRA_OEMAKE_append_class-target = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" +EXTRA_OEMAKE_append_class-nativesdk = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" + +CFLAGS_append = " -std=c99" + +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" +PROVIDES_append_class-native = " file-replacement-native" +# Don't use NATIVE_PACKAGE_PATH_SUFFIX as that hides libmagic from anyone who +# depends on file-replacement-native. +bindir_append_class-native = "/file-native" -- cgit v1.2.3-54-g00ecf