mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

file: don't replace host file when built natively

Browse Source 
To avoid races over the file binaries being replaced mid-build we made
file-native an assume-provided binary and check for it at startup, but target
file still needs a native file binary of the same version to compile the magic
data.

The least invasive way of doing this is to build a native file don't put it on
PATH, and tell the target build where to find the native binary.  We do however
want the native libmagic to be installed normally (as for example rpm and
subversion need it) so we can't use NATIVE_PACKAGE_PATH_SUFFIX as that change
libdir.

[ YOCTO #8144 ]

(From OE-Core rev: d48c0191871ce6b6fbf17d89b8f9d2750b64d671)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2015-10-16 23:02:26 +01:00
committed by Richard Purdie
parent 83a2bde15d
commit 698c3deebe
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-devtools/file/file/host-file.patch Normal file
View File

@@ -0,0 +1,32 @@
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

10
meta/recipes-devtools/file/file_5.24.bb
View File

@@ -8,12 +8,13 @@ SECTION = "console/utils"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"
DEPENDS = "zlib file-native"
DEPENDS = "zlib file-replacement-native"
DEPENDS_class-native = "zlib-native"
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 = "3c0874be4d3232d672b20f513451a39cfd7c585a"
@@ -21,6 +22,9 @@ 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() {
@@ -34,3 +38,7 @@ do_install_append_class-nativesdk() {
}
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"