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>
This commit is contained in:
parent
824e7f7951
commit
e5f9326f26
|
@ -1,32 +0,0 @@
|
|||
Upstream-Status: Submitted (http://bugs.gw.com/view.php?id=485)
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
From 3cde199d03b39632361c275cd30fa0612a03138b Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
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
|
||||
|
|
@ -17,10 +17,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!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"
|
||||
SRCREV = "3c521817322a6bf5160cfeb09b9145ccde587b2a"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools
|
Loading…
Reference in New Issue