diff options
| -rw-r--r-- | patches/daemonize-1.4/fix-destdir-install.diff | 22 | ||||
| -rw-r--r-- | patches/daemonize-1.4/series | 1 | ||||
| -rw-r--r-- | rules/daemonize.make | 66 |
3 files changed, 30 insertions, 59 deletions
diff --git a/patches/daemonize-1.4/fix-destdir-install.diff b/patches/daemonize-1.4/fix-destdir-install.diff new file mode 100644 index 000000000..6f6d61bbd --- /dev/null +++ b/patches/daemonize-1.4/fix-destdir-install.diff @@ -0,0 +1,22 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Subject: install to DESTDIR + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/Makefile.in +=================================================================== +--- a/Makefile.in ++++ b/Makefile.in +@@ -7,7 +7,7 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + INSTALL_PREFIX = @prefix@ + INSTALL = @INSTALL@ +-INSTALL_SBIN = $(INSTALL_PREFIX)/sbin ++INSTALL_SBIN = $(DESTDIR)$(INSTALL_PREFIX)/sbin + MISSING_SOURCES = @LOCAL_MISSING_SOURCES@ + MISSING_OBJECTS = $(MISSING_SOURCES:.c=.o) + CC = @CC@ diff --git a/patches/daemonize-1.4/series b/patches/daemonize-1.4/series new file mode 100644 index 000000000..2be639247 --- /dev/null +++ b/patches/daemonize-1.4/series @@ -0,0 +1 @@ +fix-destdir-install.diff diff --git a/rules/daemonize.make b/rules/daemonize.make index 95aa1c1d9..83004e628 100644 --- a/rules/daemonize.make +++ b/rules/daemonize.make @@ -29,35 +29,14 @@ DAEMONIZE_DIR = $(BUILDDIR)/$(DAEMONIZE) # Get # ---------------------------------------------------------------------------- -daemonize_get: $(STATEDIR)/daemonize.get - -$(STATEDIR)/daemonize.get: $(daemonize_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(DAEMONIZE_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, DAEMONIZE) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -daemonize_extract: $(STATEDIR)/daemonize.extract - -$(STATEDIR)/daemonize.extract: $(daemonize_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(DAEMONIZE_DIR)) - @$(call extract, DAEMONIZE) - @$(call patchin, DAEMONIZE) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -daemonize_prepare: $(STATEDIR)/daemonize.prepare - DAEMONIZE_PATH := PATH=$(CROSS_PATH) DAEMONIZE_ENV := $(CROSS_ENV) @@ -66,59 +45,28 @@ DAEMONIZE_ENV := $(CROSS_ENV) # DAEMONIZE_AUTOCONF := $(CROSS_AUTOCONF_USR) -$(STATEDIR)/daemonize.prepare: $(daemonize_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(DAEMONIZE_DIR)/config.cache) - cd $(DAEMONIZE_DIR) && \ - $(DAEMONIZE_PATH) $(DAEMONIZE_ENV) \ - ./configure $(DAEMONIZE_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -daemonize_compile: $(STATEDIR)/daemonize.compile - -$(STATEDIR)/daemonize.compile: $(daemonize_compile_deps_default) - @$(call targetinfo, $@) - cd $(DAEMONIZE_DIR) && $(DAEMONIZE_PATH) make - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -daemonize_install: $(STATEDIR)/daemonize.install - -$(STATEDIR)/daemonize.install: $(daemonize_install_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -daemonize_targetinstall: $(STATEDIR)/daemonize.targetinstall - -$(STATEDIR)/daemonize.targetinstall: $(daemonize_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/daemonize.targetinstall: + @$(call targetinfo) @$(call install_init, daemonize) @$(call install_fixup,daemonize,PACKAGE,daemonize) @$(call install_fixup,daemonize,PRIORITY,optional) @$(call install_fixup,daemonize,VERSION,$(DAEMONIZE_VERSION)) @$(call install_fixup,daemonize,SECTION,base) - @$(call install_fixup,daemonize,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,daemonize,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup,daemonize,DEPENDS,) @$(call install_fixup,daemonize,DESCRIPTION,missing) - @$(call install_copy, daemonize, 0, 0, 0755, \ - $(DAEMONIZE_DIR)/daemonize, /usr/sbin/daemonize) + @$(call install_copy, daemonize, 0, 0, 0755, -, \ + /usr/sbin/daemonize) @$(call install_finish,daemonize) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |