diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-05-25 16:46:37 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-05-26 07:21:45 +0200 |
| commit | 466c20cbb820125972060375a206e9558c549e77 (patch) | |
| tree | 77f4c680b0dd330237ad50e90aa0d73b00be0da6 /rules/timeout.make | |
| parent | f44a4d0d8cf83bdac1cde501a984b291b710fbff (diff) | |
| download | ptxdist-466c20cbb820125972060375a206e9558c549e77.tar.gz ptxdist-466c20cbb820125972060375a206e9558c549e77.tar.xz | |
timeout: cleanup
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/timeout.make')
| -rw-r--r-- | rules/timeout.make | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/rules/timeout.make b/rules/timeout.make index 7eb81cbbd..fa0781405 100644 --- a/rules/timeout.make +++ b/rules/timeout.make @@ -23,29 +23,16 @@ TIMEOUT_SUFFIX := tar.gz TIMEOUT_URL := http://www.porcupine.org/forensics/$(TIMEOUT).$(TIMEOUT_SUFFIX) TIMEOUT_SOURCE := $(SRCDIR)/$(TIMEOUT).$(TIMEOUT_SUFFIX) TIMEOUT_DIR := $(BUILDDIR)/$(TIMEOUT) +TIMEOUT_SUBDIR := src/misc # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -TIMEOUT_PATH := PATH=$(CROSS_PATH) - -TIMEOUT_MAKEVARS := $(CROSS_ENV_CC) - -$(STATEDIR)/timeout.prepare: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/timeout.compile: - @$(call targetinfo) - cd $(TIMEOUT_DIR)/src/misc && $(TIMEOUT_PATH) \ - $(MAKE) $(PARALLELMFLAGS_BROKEN) $(TIMEOUT_MAKEVARS) \ - ../../bin/timeout - @$(call touch) +TIMEOUT_CONF_TOOL := NO +TIMEOUT_MAKE_OPT := \ + $(CROSS_ENV_PROGS) \ + ../../bin/timeout # ---------------------------------------------------------------------------- # Install @@ -53,6 +40,8 @@ $(STATEDIR)/timeout.compile: $(STATEDIR)/timeout.install: @$(call targetinfo) + @install -v -D -m755 $(TIMEOUT_DIR)/bin/timeout \ + $(TIMEOUT_PKGDIR)/usr/bin/timeout @$(call touch) # ---------------------------------------------------------------------------- @@ -68,7 +57,7 @@ $(STATEDIR)/timeout.targetinstall: @$(call install_fixup, timeout,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>") @$(call install_fixup, timeout,DESCRIPTION,missing) - @$(call install_copy, timeout, 0, 0, 0755, $(TIMEOUT_DIR)/bin/timeout, /usr/bin/timeout) + @$(call install_copy, timeout, 0, 0, 0755, -, /usr/bin/timeout) @$(call install_finish, timeout) |