diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-12-06 14:59:05 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-12-06 14:59:05 +0000 |
| commit | 9caf5c796ec75bd9c9ebe31be099bff8c04adf29 (patch) | |
| tree | 2997c833605d7a6501b22bd3bce5ac6684855cb2 /rules/host-umkimage.make | |
| parent | eab85f7ddb979a9135b780a26133cecd9d92d81f (diff) | |
| download | ptxdist-9caf5c796ec75bd9c9ebe31be099bff8c04adf29.tar.gz ptxdist-9caf5c796ec75bd9c9ebe31be099bff8c04adf29.tar.xz | |
* host-umkimage.make:
regenerated, version bump -> 1.1.6
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6454 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/host-umkimage.make')
| -rw-r--r-- | rules/host-umkimage.make | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make index 80ccbbd28..ce12b962c 100644 --- a/rules/host-umkimage.make +++ b/rules/host-umkimage.make @@ -1,6 +1,7 @@ # -*-makefile-*- +# $Id$ # -# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany +# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany # # See CREDITS for details about who has contributed to this project. # @@ -16,13 +17,12 @@ HOST_PACKAGES-$(PTXCONF_HOST_UMKIMAGE) += host-umkimage # # Paths and names # -HOST_UMKIMAGE_VERSION = 1.1.2 -HOST_UMKIMAGE = u-boot-mkimage-$(HOST_UMKIMAGE_VERSION) -HOST_UMKIMAGE_SUFFIX = tar.gz -HOST_UMKIMAGE_URL = http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOST_UMKIMAGE).$(HOST_UMKIMAGE_SUFFIX) -HOST_UMKIMAGE_SOURCE = $(SRCDIR)/$(HOST_UMKIMAGE).$(HOST_UMKIMAGE_SUFFIX) -HOST_UMKIMAGE_DIR = $(HOST_BUILDDIR)/$(HOST_UMKIMAGE) - +HOST_UMKIMAGE_VERSION := 1.1.6 +HOST_UMKIMAGE := u-boot-mkimage-$(HOST_UMKIMAGE_VERSION) +HOST_UMKIMAGE_SUFFIX := tar.bz2 +HOST_UMKIMAGE_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOST_UMKIMAGE).$(HOST_UMKIMAGE_SUFFIX) +HOST_UMKIMAGE_SOURCE := $(SRCDIR)/$(HOST_UMKIMAGE).$(HOST_UMKIMAGE_SUFFIX) +HOST_UMKIMAGE_DIR := $(HOST_BUILDDIR)/$(HOST_UMKIMAGE) # ---------------------------------------------------------------------------- # Get @@ -48,6 +48,7 @@ $(STATEDIR)/host-umkimage.extract: $(host-umkimage_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_UMKIMAGE_DIR)) @$(call extract, HOST_UMKIMAGE, $(HOST_BUILDDIR)) + @$(call patchin, HOST_UMKIMAGE, $(HOST_UMKIMAGE_DIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -56,11 +57,12 @@ $(STATEDIR)/host-umkimage.extract: $(host-umkimage_extract_deps_default) host-umkimage_prepare: $(STATEDIR)/host-umkimage.prepare -HOST_UMKIMAGE_MAKEVARS = CC=$(HOSTCC) -HOST_UMKIMAGE_ENV = CFLAGS=-I$(PTXCONF_PREFIX)/include +HOST_UMKIMAGE_PATH := PATH=$(HOST_PATH) +HOST_UMKIMAGE_ENV := $(HOST_ENV) $(STATEDIR)/host-umkimage.prepare: $(host-umkimage_prepare_deps_default) @$(call targetinfo, $@) + cd $(HOST_UMKIMAGE_DIR) && $(HOST_UMKIMAGE_PATH) $(MAKE) clean @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -71,7 +73,7 @@ host-umkimage_compile: $(STATEDIR)/host-umkimage.compile $(STATEDIR)/host-umkimage.compile: $(host-umkimage_compile_deps_default) @$(call targetinfo, $@) - $(HOST_UMKIMAGE_ENV) make -C $(HOST_UMKIMAGE_DIR) $(HOST_UMKIMAGE_MAKEVARS) + cd $(HOST_UMKIMAGE_DIR) && $(HOST_UMKIMAGE_PATH) $(HOST_UMKIMAGE_ENV) $(MAKE) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -82,18 +84,7 @@ host-umkimage_install: $(STATEDIR)/host-umkimage.install $(STATEDIR)/host-umkimage.install: $(host-umkimage_install_deps_default) @$(call targetinfo, $@) - mkdir -p $(PTXCONF_HOST_PREFIX)/bin - install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_HOST_PREFIX)/bin/u-boot-mkimage - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -host-umkimage_targetinstall: $(STATEDIR)/host-umkimage.targetinstall - -$(STATEDIR)/host-umkimage.targetinstall: $(host-umkimage_targetinstall_deps_default) - @$(call targetinfo, $@) + install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_HOST_PREFIX)/bin/mkimage @$(call touch, $@) # ---------------------------------------------------------------------------- |