One of the patches has been accepted upstream, the others are ported. Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> --- ....ac-fix-handling-for-enable-clock_gettime.patch | 26 ---------------------- patches/haveged-1.9.1/series | 8 ------- .../0001-init-fix-path-for-systemd-unit-dir.patch} | 8 +++++-- ...stallation-of-systemd-unit-file-DESTDIR-.patch} | 9 ++++++-- ...kefile.am-create-nonexisting-directories.patch} | 8 +++++-- ...ile.am-do-not-call-systemd-during-compil.patch} | 9 ++++++-- .../{haveged-1.9.1 => haveged-1.9.2}/autogen.sh | 0 patches/haveged-1.9.2/series | 4 ++++ rules/haveged.make | 4 ++-- 9 files changed, 32 insertions(+), 44 deletions(-) delete mode 100644 patches/haveged-1.9.1/0001-configure.ac-fix-handling-for-enable-clock_gettime.patch delete mode 100644 patches/haveged-1.9.1/series rename patches/{haveged-1.9.1/0002-init-fix-path-for-systemd-unit-dir.patch => haveged-1.9.2/0001-init-fix-path-for-systemd-unit-dir.patch} (80%) rename patches/{haveged-1.9.1/0003-init-make-installation-of-systemd-unit-file-DESTDIR-.patch => haveged-1.9.2/0002-init-make-installation-of-systemd-unit-file-DESTDIR-.patch} (82%) rename patches/{haveged-1.9.1/0004-init.d-Makefile.am-create-nonexisting-directories.patch => haveged-1.9.2/0003-init.d-Makefile.am-create-nonexisting-directories.patch} (86%) rename patches/{haveged-1.9.1/0005-init.d-Makefile.am-do-not-call-systemd-during-compil.patch => haveged-1.9.2/0004-init.d-Makefile.am-do-not-call-systemd-during-compil.patch} (80%) rename patches/{haveged-1.9.1 => haveged-1.9.2}/autogen.sh (100%) create mode 100644 patches/haveged-1.9.2/series
diff --git a/patches/haveged-1.9.1/0001-configure.ac-fix-handling-for-enable-clock_gettime.patch b/patches/haveged-1.9.1/0001-configure.ac-fix-handling-for-enable-clock_gettime.patch deleted file mode 100644 index 20a34b466..000000000 --- a/patches/haveged-1.9.1/0001-configure.ac-fix-handling-for-enable-clock_gettime.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Robert Schwebel <r.schwe...@pengutronix.de> -Date: Thu, 29 Jun 2017 22:30:34 +0200 -Subject: [PATCH] configure.ac: fix handling for --enable-clock_gettime - -The logic for this configure option is broken; on ARM, we fall into the -*) path and the logic decides that this option is not set, no matter if -we set it or not. - -Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index f8d76c106014..e4f17a80d876 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -175,6 +175,8 @@ case "$host" in - *) - if test "x$enable_clock_gettime" = "xx"; then - enable_clock_gettime="yes" -+ elif test "x$enable_clock_gettime" = "xyes"; then -+ enable_clock_gettime="yes" - else - AC_MSG_ERROR([no timer source for host :"$host".]) - fi diff --git a/patches/haveged-1.9.1/series b/patches/haveged-1.9.1/series deleted file mode 100644 index 0e24f4d6b..000000000 --- a/patches/haveged-1.9.1/series +++ /dev/null @@ -1,8 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-configure.ac-fix-handling-for-enable-clock_gettime.patch -0002-init-fix-path-for-systemd-unit-dir.patch -0003-init-make-installation-of-systemd-unit-file-DESTDIR-.patch -0004-init.d-Makefile.am-create-nonexisting-directories.patch -0005-init.d-Makefile.am-do-not-call-systemd-during-compil.patch -# d6dc334689ded00c3e697eb3fe83b57a - git-ptx-patches magic diff --git a/patches/haveged-1.9.1/0002-init-fix-path-for-systemd-unit-dir.patch b/patches/haveged-1.9.2/0001-init-fix-path-for-systemd-unit-dir.patch similarity index 80% rename from patches/haveged-1.9.1/0002-init-fix-path-for-systemd-unit-dir.patch rename to patches/haveged-1.9.2/0001-init-fix-path-for-systemd-unit-dir.patch index 6ae95fbb5..3e89840c6 100644 --- a/patches/haveged-1.9.1/0002-init-fix-path-for-systemd-unit-dir.patch +++ b/patches/haveged-1.9.2/0001-init-fix-path-for-systemd-unit-dir.patch @@ -1,6 +1,7 @@ +From 2d52bd21152d44072520622d2683e5c159a7e515 Mon Sep 17 00:00:00 2001 From: Robert Schwebel <r.schwe...@pengutronix.de> Date: Thu, 29 Jun 2017 22:53:16 +0200 -Subject: [PATCH] init: fix path for systemd unit dir +Subject: [PATCH 1/4] init: fix path for systemd unit dir This branch was obviously not tested. @@ -10,7 +11,7 @@ Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.d/Makefile.am b/init.d/Makefile.am -index ca3ad1c1e854..bf86773176a6 100644 +index ca3ad1c..bf86773 100644 --- a/init.d/Makefile.am +++ b/init.d/Makefile.am @@ -37,7 +37,7 @@ install-data-hook: @@ -22,3 +23,6 @@ index ca3ad1c1e854..bf86773176a6 100644 endif systemctl enable haveged.service; +-- +2.15.0 + diff --git a/patches/haveged-1.9.1/0003-init-make-installation-of-systemd-unit-file-DESTDIR-.patch b/patches/haveged-1.9.2/0002-init-make-installation-of-systemd-unit-file-DESTDIR-.patch similarity index 82% rename from patches/haveged-1.9.1/0003-init-make-installation-of-systemd-unit-file-DESTDIR-.patch rename to patches/haveged-1.9.2/0002-init-make-installation-of-systemd-unit-file-DESTDIR-.patch index 5a536871a..23eb05a2c 100644 --- a/patches/haveged-1.9.1/0003-init-make-installation-of-systemd-unit-file-DESTDIR-.patch +++ b/patches/haveged-1.9.2/0002-init-make-installation-of-systemd-unit-file-DESTDIR-.patch @@ -1,6 +1,8 @@ +From ba60edc3c1bb6feb576f868e6f9daaf5fe417e83 Mon Sep 17 00:00:00 2001 From: Robert Schwebel <r.schwe...@pengutronix.de> Date: Thu, 29 Jun 2017 22:54:11 +0200 -Subject: [PATCH] init: make installation of systemd unit file DESTDIR aware +Subject: [PATCH 2/4] init: make installation of systemd unit file DESTDIR + aware The installation currently does not care about a DESTDIR, which is imporant when cross compiling. @@ -11,7 +13,7 @@ Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.d/Makefile.am b/init.d/Makefile.am -index bf86773176a6..2f92cb7fdde4 100644 +index bf86773..2f92cb7 100644 --- a/init.d/Makefile.am +++ b/init.d/Makefile.am @@ -35,9 +35,9 @@ install-exec-hook: @@ -26,3 +28,6 @@ index bf86773176a6..2f92cb7fdde4 100644 endif systemctl enable haveged.service; +-- +2.15.0 + diff --git a/patches/haveged-1.9.1/0004-init.d-Makefile.am-create-nonexisting-directories.patch b/patches/haveged-1.9.2/0003-init.d-Makefile.am-create-nonexisting-directories.patch similarity index 86% rename from patches/haveged-1.9.1/0004-init.d-Makefile.am-create-nonexisting-directories.patch rename to patches/haveged-1.9.2/0003-init.d-Makefile.am-create-nonexisting-directories.patch index 6f693b000..e40ddf0ba 100644 --- a/patches/haveged-1.9.1/0004-init.d-Makefile.am-create-nonexisting-directories.patch +++ b/patches/haveged-1.9.2/0003-init.d-Makefile.am-create-nonexisting-directories.patch @@ -1,6 +1,7 @@ +From 569372a4e5982cc0f30e797a51023f8e571d18ab Mon Sep 17 00:00:00 2001 From: Robert Schwebel <r.schwe...@pengutronix.de> Date: Thu, 29 Jun 2017 22:59:46 +0200 -Subject: [PATCH] init.d/Makefile.am: create nonexisting directories +Subject: [PATCH 3/4] init.d/Makefile.am: create nonexisting directories install can't assume that all leading directories do already exist. While this will in most cases be true on normal desktop/server @@ -14,7 +15,7 @@ Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.d/Makefile.am b/init.d/Makefile.am -index 2f92cb7fdde4..4a6e551f0b51 100644 +index 2f92cb7..4a6e551 100644 --- a/init.d/Makefile.am +++ b/init.d/Makefile.am @@ -35,9 +35,9 @@ install-exec-hook: @@ -29,3 +30,6 @@ index 2f92cb7fdde4..4a6e551f0b51 100644 endif systemctl enable haveged.service; +-- +2.15.0 + diff --git a/patches/haveged-1.9.1/0005-init.d-Makefile.am-do-not-call-systemd-during-compil.patch b/patches/haveged-1.9.2/0004-init.d-Makefile.am-do-not-call-systemd-during-compil.patch similarity index 80% rename from patches/haveged-1.9.1/0005-init.d-Makefile.am-do-not-call-systemd-during-compil.patch rename to patches/haveged-1.9.2/0004-init.d-Makefile.am-do-not-call-systemd-during-compil.patch index 359708a18..f60a47389 100644 --- a/patches/haveged-1.9.1/0005-init.d-Makefile.am-do-not-call-systemd-during-compil.patch +++ b/patches/haveged-1.9.2/0004-init.d-Makefile.am-do-not-call-systemd-during-compil.patch @@ -1,6 +1,8 @@ +From 59c849bf53c3dd4d260d2a6f85c87002be88c6ef Mon Sep 17 00:00:00 2001 From: Robert Schwebel <r.schwe...@pengutronix.de> Date: Thu, 29 Jun 2017 23:03:06 +0200 -Subject: [PATCH] init.d/Makefile.am: do not call systemd during compilation +Subject: [PATCH 4/4] init.d/Makefile.am: do not call systemd during + compilation Remove systemd call: we can not assume that the user is allowed to do so: he might not if he compiles the software as non-root. @@ -17,7 +19,7 @@ Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> 1 file changed, 2 deletions(-) diff --git a/init.d/Makefile.am b/init.d/Makefile.am -index 4a6e551f0b51..efb01e3c8aab 100644 +index 4a6e551..efb01e3 100644 --- a/init.d/Makefile.am +++ b/init.d/Makefile.am @@ -39,6 +39,4 @@ if ENABLE_SYSTEMD_LOOKUP @@ -27,3 +29,6 @@ index 4a6e551f0b51..efb01e3c8aab 100644 - systemctl enable haveged.service; - endif +-- +2.15.0 + diff --git a/patches/haveged-1.9.1/autogen.sh b/patches/haveged-1.9.2/autogen.sh similarity index 100% rename from patches/haveged-1.9.1/autogen.sh rename to patches/haveged-1.9.2/autogen.sh diff --git a/patches/haveged-1.9.2/series b/patches/haveged-1.9.2/series new file mode 100644 index 000000000..476af148b --- /dev/null +++ b/patches/haveged-1.9.2/series @@ -0,0 +1,4 @@ +0001-init-fix-path-for-systemd-unit-dir.patch +0002-init-make-installation-of-systemd-unit-file-DESTDIR-.patch +0003-init.d-Makefile.am-create-nonexisting-directories.patch +0004-init.d-Makefile.am-do-not-call-systemd-during-compil.patch diff --git a/rules/haveged.make b/rules/haveged.make index 1782cf1e7..ce748eecc 100644 --- a/rules/haveged.make +++ b/rules/haveged.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_HAVEGED) += haveged # # Paths and names # -HAVEGED_VERSION := 1.9.1 -HAVEGED_MD5 := 015ff58cd10607db0e0de60aeca2f5f8 +HAVEGED_VERSION := 1.9.2 +HAVEGED_MD5 := a8b8ebe7dbebb6a873942edd430b3ebd HAVEGED := haveged-$(HAVEGED_VERSION) HAVEGED_SUFFIX := tar.gz HAVEGED_URL := \ -- 2.15.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de