From 57f4a5ca47e8e343ae30a07b922be0c177280b2f Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 15 Nov 2011 12:58:40 -0800 Subject: file: update to 5.09 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../file/file/fix_version_check.patch | 21 ++++++++++++ meta/recipes-devtools/file/file_5.04.bb | 39 ---------------------- meta/recipes-devtools/file/file_5.09.bb | 38 +++++++++++++++++++++ 3 files changed, 59 insertions(+), 39 deletions(-) create mode 100644 meta/recipes-devtools/file/file/fix_version_check.patch delete mode 100644 meta/recipes-devtools/file/file_5.04.bb create mode 100644 meta/recipes-devtools/file/file_5.09.bb (limited to 'meta/recipes-devtools/file') diff --git a/meta/recipes-devtools/file/file/fix_version_check.patch b/meta/recipes-devtools/file/file/fix_version_check.patch new file mode 100644 index 0000000000..bd24ccb49f --- /dev/null +++ b/meta/recipes-devtools/file/file/fix_version_check.patch @@ -0,0 +1,21 @@ +Since we are cross-compiling and need to have a cover script this +version check sees "file.real-5.09" not "file-5.09", so fix the +sed. + +Upstream-Status: Inapproriate [build-specific] + +Signed-off-by: Saul Wold + +Index: file-5.09/magic/Makefile.am +=================================================================== +--- file-5.09.orig/magic/Makefile.am ++++ file-5.09/magic/Makefile.am +@@ -260,7 +260,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_D + @(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 --version | sed -e s/file.real-// -e q); \ + if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ + echo "Cannot use the installed version of file ($$v) to"; \ + echo "cross-compile file ${PACKAGE_VERSION}"; \ diff --git a/meta/recipes-devtools/file/file_5.04.bb b/meta/recipes-devtools/file/file_5.04.bb deleted file mode 100644 index 1f9c78eb7b..0000000000 --- a/meta/recipes-devtools/file/file_5.04.bb +++ /dev/null @@ -1,39 +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-native" -DEPENDS_virtclass-native = "zlib-native" -PR = "r2" - -SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ - file://stringb-compat.patch \ - file://ge-le.patch \ - file://dump \ - file://filesystems" - -SRC_URI[md5sum] = "accade81ff1cc774904b47c72c8aeea0" -SRC_URI[sha256sum] = "4c9e6e7994e74cb3386374ae91b055d26ac96b9d3e82fd157ae2d62e87a4260c" - -inherit autotools - -do_configure_prepend() { - cp ${WORKDIR}/dump ${S}/magic/Magdir/ - cp ${WORKDIR}/filesystems ${S}/magic/Magdir/ -} - -FILES_${PN} += "${datadir}/misc/*.mgc" - -do_install_append_virtclass-native() { - create_cmdline_wrapper ${D}/${bindir}/file \ - --magic-file ${datadir}/misc/magic.mgc -} - - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/file/file_5.09.bb b/meta/recipes-devtools/file/file_5.09.bb new file mode 100644 index 0000000000..9b2f3a42af --- /dev/null +++ b/meta/recipes-devtools/file/file_5.09.bb @@ -0,0 +1,38 @@ +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-native" +DEPENDS_virtclass-native = "zlib-native" +PR = "r0" + +SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ + file://fix_version_check.patch \ + file://dump \ + file://filesystems" + +SRC_URI[md5sum] = "6fd7cd6c4281e68fe9ec6644ce0fac6f" +SRC_URI[sha256sum] = "bde1c9830ee6c234871778faae8277fdcf775fbb16dea63c8251e24b7c2f869c" + +inherit autotools + +do_configure_prepend() { + cp ${WORKDIR}/dump ${S}/magic/Magdir/ + cp ${WORKDIR}/filesystems ${S}/magic/Magdir/ +} + +FILES_${PN} += "${datadir}/misc/*.mgc" + +do_install_append_virtclass-native() { + create_cmdline_wrapper ${D}/${bindir}/file \ + --magic-file ${datadir}/misc/magic.mgc +} + + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg