summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/file
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-07-06 18:37:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-12 23:10:15 +0100
commite5f9326f26f3ebd77dab8b396cf956cf5ef8077f (patch)
tree507e013144a448d4fcc2adde3a222f754e8b9137 /meta/recipes-devtools/file
parent824e7f7951266eae9adf776cf10246b2b92d4835 (diff)
downloadpoky-e5f9326f26f3ebd77dab8b396cf956cf5ef8077f.tar.gz
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 <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/file')
-rw-r--r--meta/recipes-devtools/file/file/host-file.patch32
-rw-r--r--meta/recipes-devtools/file/file_5.28.bb (renamed from meta/recipes-devtools/file/file_5.27.bb)3
2 files changed, 1 insertions, 34 deletions
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 @@
1Upstream-Status: Submitted (http://bugs.gw.com/view.php?id=485)
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 3cde199d03b39632361c275cd30fa0612a03138b Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Mon, 19 Oct 2015 10:30:57 +0100
7Subject: [PATCH 2/2] When using the host file, respect FILE_COMPILE
8
9If we're cross-compiling and not using the file binary that was just built,
10execute the binary that we've been told to use (via FILE_COMPILE) when checking
11the version instead of assuming that "file" is correct as the actual compile
12uses FILE_COMPILE so different binaries may be used.
13---
14 magic/Makefile.am | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/magic/Makefile.am b/magic/Makefile.am
18index 89ac844..67067fe 100644
19--- a/magic/Makefile.am
20+++ b/magic/Makefile.am
21@@ -293,7 +293,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
22 @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
23 echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
24 else \
25- v=$$(file --version | sed -e s/file-// -e q); \
26+ v=$$(${FILE_COMPILE} --version | sed -e s/file-// -e q); \
27 if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
28 echo "Cannot use the installed version of file ($$v) to"; \
29 echo "cross-compile file ${PACKAGE_VERSION}"; \
30--
312.1.4
32
diff --git a/meta/recipes-devtools/file/file_5.27.bb b/meta/recipes-devtools/file/file_5.28.bb
index d1bbf6bc3c..516c8c55be 100644
--- a/meta/recipes-devtools/file/file_5.27.bb
+++ b/meta/recipes-devtools/file/file_5.28.bb
@@ -17,10 +17,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)"
17SRC_URI = "git://github.com/file/file.git \ 17SRC_URI = "git://github.com/file/file.git \
18 file://debian-742262.patch \ 18 file://debian-742262.patch \
19 file://0001-Add-P-prompt-into-Usage-info.patch \ 19 file://0001-Add-P-prompt-into-Usage-info.patch \
20 file://host-file.patch \
21 " 20 "
22 21
23SRCREV = "72da5ae78ed7b5ecbbe84c36ddb493f7907099bc" 22SRCREV = "3c521817322a6bf5160cfeb09b9145ccde587b2a"
24S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
25 24
26inherit autotools 25inherit autotools