| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From b04eeea777df32364df74bd63fc5b7fb05d21c8d Mon Sep 17 00:00:00 2001 |
| 2 | From: Jackie Huang <jackie.huang@windriver.com> |
| 3 | Date: Tue, 27 Mar 2018 10:21:09 +0800 |
| 4 | Subject: [PATCH] init.d/Makefile.am: add missing dependency |
| 5 | |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 6 | install-data-hook should depend on install-exec-hook, or the |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 7 | haveged.service might be installed incorrectly when build |
| 8 | with -j option. |
| 9 | |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 10 | Upstream-Status: Submitted [https://github.com/jirka-h/haveged/pull/13] |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 11 | |
| 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 13 | Signed-off-by: Khem Raj raj.khem@gmail.com |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 14 | --- |
| 15 | init.d/Makefile.am | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/init.d/Makefile.am b/init.d/Makefile.am |
| 19 | index 5940f78..07bcdf7 100644 |
| 20 | --- a/init.d/Makefile.am |
| 21 | +++ b/init.d/Makefile.am |
| 22 | @@ -33,7 +33,7 @@ if ENABLE_SYSTEMD |
| 23 | install-exec-hook: |
| 24 | $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 25 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 26 | -install-data-hook: |
| 27 | +install-data-hook: install-exec-hook |
| 28 | if ENABLE_SYSTEMD_LOOKUP |
| 29 | install -p -D -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; |
| 30 | else |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 31 | -- |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 32 | 2.11.0 |