summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/file/file
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-11-15 12:58:40 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 17:32:44 +0000
commit9a566d76f5475fe731abf9bec36f0631d14a322c (patch)
tree774634e0590f715bc4aead7bce6111d9c5e4476a /meta/recipes-devtools/file/file
parent7e2682d5b1251084d40633af6c104526d98d97f1 (diff)
downloadpoky-9a566d76f5475fe731abf9bec36f0631d14a322c.tar.gz
file: update to 5.09
(From OE-Core rev: 57f4a5ca47e8e343ae30a07b922be0c177280b2f) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/file/file')
-rw-r--r--meta/recipes-devtools/file/file/fix_version_check.patch21
1 files changed, 21 insertions, 0 deletions
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 @@
1Since we are cross-compiling and need to have a cover script this
2version check sees "file.real-5.09" not "file-5.09", so fix the
3sed.
4
5Upstream-Status: Inapproriate [build-specific]
6
7Signed-off-by: Saul Wold <sgw@linux.intel.com>
8
9Index: file-5.09/magic/Makefile.am
10===================================================================
11--- file-5.09.orig/magic/Makefile.am
12+++ file-5.09/magic/Makefile.am
13@@ -260,7 +260,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_D
14 @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
15 echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
16 else \
17- v=$$(file --version | sed -e s/file-// -e q); \
18+ v=$$(file --version | sed -e s/file.real-// -e q); \
19 if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
20 echo "Cannot use the installed version of file ($$v) to"; \
21 echo "cross-compile file ${PACKAGE_VERSION}"; \