From e5f9326f26f3ebd77dab8b396cf956cf5ef8077f Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 6 Jul 2016 18:37:06 -0700 Subject: file: 5.27 -> 5.28 Remove host-file.patch which is already in the source. (From OE-Core rev: 43c2dcb70d88eeed2735eb4347e89250d606cd42) Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/file/file/host-file.patch | 32 ----------------- meta/recipes-devtools/file/file_5.27.bb | 47 ------------------------- meta/recipes-devtools/file/file_5.28.bb | 46 ++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-devtools/file/file/host-file.patch delete mode 100644 meta/recipes-devtools/file/file_5.27.bb create mode 100644 meta/recipes-devtools/file/file_5.28.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/file/file/host-file.patch b/meta/recipes-devtools/file/file/host-file.patch deleted file mode 100644 index a7efbdcbcc..0000000000 --- a/meta/recipes-devtools/file/file/host-file.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Submitted (http://bugs.gw.com/view.php?id=485) -Signed-off-by: Ross Burton - -From 3cde199d03b39632361c275cd30fa0612a03138b Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 19 Oct 2015 10:30:57 +0100 -Subject: [PATCH 2/2] When using the host file, respect FILE_COMPILE - -If we're cross-compiling and not using the file binary that was just built, -execute the binary that we've been told to use (via FILE_COMPILE) when checking -the version instead of assuming that "file" is correct as the actual compile -uses FILE_COMPILE so different binaries may be used. ---- - magic/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/magic/Makefile.am b/magic/Makefile.am -index 89ac844..67067fe 100644 ---- a/magic/Makefile.am -+++ b/magic/Makefile.am -@@ -293,7 +293,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) - @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ - echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ - else \ -- v=$$(file --version | sed -e s/file-// -e q); \ -+ v=$$(${FILE_COMPILE} --version | sed -e s/file-// -e q); \ - if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ - echo "Cannot use the installed version of file ($$v) to"; \ - echo "cross-compile file ${PACKAGE_VERSION}"; \ --- -2.1.4 - diff --git a/meta/recipes-devtools/file/file_5.27.bb b/meta/recipes-devtools/file/file_5.27.bb deleted file mode 100644 index d1bbf6bc3c..0000000000 --- a/meta/recipes-devtools/file/file_5.27.bb +++ /dev/null @@ -1,47 +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 \ - file://host-file.patch \ - " - -SRCREV = "72da5ae78ed7b5ecbbe84c36ddb493f7907099bc" -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" - -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.28.bb b/meta/recipes-devtools/file/file_5.28.bb new file mode 100644 index 0000000000..516c8c55be --- /dev/null +++ b/meta/recipes-devtools/file/file_5.28.bb @@ -0,0 +1,46 @@ +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 = "3c521817322a6bf5160cfeb09b9145ccde587b2a" +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" + +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 1.2.3-korg