summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-12-07 11:35:56 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-12-07 11:35:59 +0100
commite621f84c3679917f37172892e5665633348c1a0f (patch)
tree34afca152031100c2807c0d68752ec1c50cd56e0
parent6c14f9498bafcd51f0b635224f2c8c676d7238ac (diff)
downloadptxdist-e621f84c3679917f37172892e5665633348c1a0f.tar.gz
ptxdist-e621f84c3679917f37172892e5665633348c1a0f.tar.xz
file: move host 'file' out of sysroot-host/bin
host-file is only needed and usefull to generate the 'magic' for the target. It cannot be used for anything else, because it won't find its magic. This fixes this error when downloading files: file: could not find any magic files! Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/file.make17
-rw-r--r--rules/host-file.make3
2 files changed, 14 insertions, 6 deletions
diff --git a/rules/file.make b/rules/file.make
index 5c7d73944..172037da7 100644
--- a/rules/file.make
+++ b/rules/file.make
@@ -17,14 +17,19 @@ PACKAGES-$(PTXCONF_FILE) += file
# Paths and names
#
FILE_VERSION := 5.11
-FILE_MD5 := 16a407bd66d6c7a832f3a5c0d609c27b
-FILE := file-$(FILE_VERSION)
-FILE_SUFFIX := tar.gz
-FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
-FILE_SOURCE := $(SRCDIR)/$(FILE).$(FILE_SUFFIX)
-FILE_DIR := $(BUILDDIR)/$(FILE)
+FILE_MD5 := 16a407bd66d6c7a832f3a5c0d609c27b
+FILE := file-$(FILE_VERSION)
+FILE_SUFFIX := tar.gz
+FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
+FILE_SOURCE := $(SRCDIR)/$(FILE).$(FILE_SUFFIX)
+FILE_DIR := $(BUILDDIR)/$(FILE)
FILE_LICENSE := unknown
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+FILE_PATH := PATH=$(PTXDIST_SYSROOT_HOST)/bin/file:$(CROSS_PATH)
FILE_CONF_TOOL := autoconf
# ----------------------------------------------------------------------------
diff --git a/rules/host-file.make b/rules/host-file.make
index ba796b562..cbc0cb42c 100644
--- a/rules/host-file.make
+++ b/rules/host-file.make
@@ -14,5 +14,8 @@
HOST_PACKAGES-$(PTXCONF_HOST_FILE) += host-file
HOST_FILE_CONF_TOOL := autoconf
+HOST_FILE_CONF_OPT := \
+ $(HOST_AUTOCONF) \
+ --bindir=/bin/file
# vim: syntax=make