The patches have been accepted upstream, so they are not necessary any more.
Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> --- Changes since (implicit) v1: * upstream has recreated the release archive, as some of my patches have been forgotten; the MD5 sum has changed since v1. ....ac-fix-handling-for-enable-clock_gettime.patch | 26 ------------------ .../0002-init-fix-path-for-systemd-unit-dir.patch | 24 ----------------- ...nstallation-of-systemd-unit-file-DESTDIR-.patch | 28 ------------------- ...akefile.am-create-nonexisting-directories.patch | 31 ---------------------- ...file.am-do-not-call-systemd-during-compil.patch | 29 -------------------- patches/haveged-1.9.1/autogen.sh | 1 - patches/haveged-1.9.1/series | 8 ------ rules/haveged.make | 4 +-- 8 files changed, 2 insertions(+), 149 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/0002-init-fix-path-for-systemd-unit-dir.patch delete mode 100644 patches/haveged-1.9.1/0003-init-make-installation-of-systemd-unit-file-DESTDIR-.patch delete mode 100644 patches/haveged-1.9.1/0004-init.d-Makefile.am-create-nonexisting-directories.patch delete mode 100644 patches/haveged-1.9.1/0005-init.d-Makefile.am-do-not-call-systemd-during-compil.patch delete mode 120000 patches/haveged-1.9.1/autogen.sh delete mode 100644 patches/haveged-1.9.1/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/0002-init-fix-path-for-systemd-unit-dir.patch b/patches/haveged-1.9.1/0002-init-fix-path-for-systemd-unit-dir.patch deleted file mode 100644 index 6ae95fbb5..000000000 --- a/patches/haveged-1.9.1/0002-init-fix-path-for-systemd-unit-dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 - -This branch was obviously not tested. - -Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> ---- - init.d/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/init.d/Makefile.am b/init.d/Makefile.am -index ca3ad1c1e854..bf86773176a6 100644 ---- a/init.d/Makefile.am -+++ b/init.d/Makefile.am -@@ -37,7 +37,7 @@ install-data-hook: - if ENABLE_SYSTEMD_LOOKUP - install -p -m644 haveged.service `pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; - else -- install -p -m644 haveged.service ($unit_dir)/haveged.service; -+ install -p -m644 haveged.service $(unit_dir)/haveged.service; - endif - systemctl enable haveged.service; - diff --git a/patches/haveged-1.9.1/0003-init-make-installation-of-systemd-unit-file-DESTDIR-.patch b/patches/haveged-1.9.1/0003-init-make-installation-of-systemd-unit-file-DESTDIR-.patch deleted file mode 100644 index 5a536871a..000000000 --- a/patches/haveged-1.9.1/0003-init-make-installation-of-systemd-unit-file-DESTDIR-.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 - -The installation currently does not care about a DESTDIR, which is -imporant when cross compiling. - -Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> ---- - init.d/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/init.d/Makefile.am b/init.d/Makefile.am -index bf86773176a6..2f92cb7fdde4 100644 ---- a/init.d/Makefile.am -+++ b/init.d/Makefile.am -@@ -35,9 +35,9 @@ install-exec-hook: - - install-data-hook: - if ENABLE_SYSTEMD_LOOKUP -- install -p -m644 haveged.service `pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; -+ install -p -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; - else -- install -p -m644 haveged.service $(unit_dir)/haveged.service; -+ install -p -m644 haveged.service $(DESTDIR)$(unit_dir)/haveged.service; - endif - systemctl enable haveged.service; - diff --git a/patches/haveged-1.9.1/0004-init.d-Makefile.am-create-nonexisting-directories.patch b/patches/haveged-1.9.1/0004-init.d-Makefile.am-create-nonexisting-directories.patch deleted file mode 100644 index 6f693b000..000000000 --- a/patches/haveged-1.9.1/0004-init.d-Makefile.am-create-nonexisting-directories.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 - -install can't assume that all leading directories do already exist. -While this will in most cases be true on normal desktop/server -distributions, cross build systems or systems that build single packages -will build into a fresh hierarchy. Add -D to install, in order to create -the leading directories. - -Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> ---- - init.d/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/init.d/Makefile.am b/init.d/Makefile.am -index 2f92cb7fdde4..4a6e551f0b51 100644 ---- a/init.d/Makefile.am -+++ b/init.d/Makefile.am -@@ -35,9 +35,9 @@ install-exec-hook: - - install-data-hook: - if ENABLE_SYSTEMD_LOOKUP -- install -p -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; -+ install -p -D -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; - else -- install -p -m644 haveged.service $(DESTDIR)$(unit_dir)/haveged.service; -+ install -p -D -m644 haveged.service $(DESTDIR)$(unit_dir)/haveged.service; - endif - systemctl enable haveged.service; - 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.1/0005-init.d-Makefile.am-do-not-call-systemd-during-compil.patch deleted file mode 100644 index 359708a18..000000000 --- a/patches/haveged-1.9.1/0005-init.d-Makefile.am-do-not-call-systemd-during-compil.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - -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. - -When cross-compiling, the intended systemd might not even run on the -same hardware. - -We better leave the decision whether or not to call systemd to the -administrator. - -Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> ---- - init.d/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/init.d/Makefile.am b/init.d/Makefile.am -index 4a6e551f0b51..efb01e3c8aab 100644 ---- a/init.d/Makefile.am -+++ b/init.d/Makefile.am -@@ -39,6 +39,4 @@ if ENABLE_SYSTEMD_LOOKUP - else - install -p -D -m644 haveged.service $(DESTDIR)$(unit_dir)/haveged.service; - endif -- systemctl enable haveged.service; -- - endif diff --git a/patches/haveged-1.9.1/autogen.sh b/patches/haveged-1.9.1/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/haveged-1.9.1/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file 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/rules/haveged.make b/rules/haveged.make index 1782cf1e7..42fae96c9 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 := fb1d8b3dcbb9d06b30eccd8aa500fd31 HAVEGED := haveged-$(HAVEGED_VERSION) HAVEGED_SUFFIX := tar.gz HAVEGED_URL := \ -- 2.15.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de