From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] haveged: version bump 1.9.2 -> 1.9.8
Date: Tue, 10 Dec 2019 12:12:16 +0100 [thread overview]
Message-ID: <20191210111216.xi3l3ya6qbvjfvan@pengutronix.de> (raw)
In-Reply-To: <20191210100856.11655-1-christian.hermann@hytera.de>
On Tue, Dec 10, 2019 at 11:08:56AM +0100, Christian Hermann wrote:
> * upstream provides new tarballs only on github
> * pull upstream patch to enable threads
> * fix license identifier
>
> Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> ---
> ...-fix-compilation-with-enable-threads.patch | 33 +++++++++++++++++++
> patches/haveged-1.9.8/series | 1 +
> rules/haveged.make | 14 ++++----
> 3 files changed, 42 insertions(+), 6 deletions(-)
> create mode 100644 patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch
> create mode 100644 patches/haveged-1.9.8/series
>
> diff --git a/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch
> new file mode 100644
> index 000000000..38895a97c
> --- /dev/null
> +++ b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch
> @@ -0,0 +1,33 @@
> +From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001
> +From: Lars Wendler <polynomial-c@gentoo.org>
> +Date: Thu, 14 Nov 2019 16:15:00 +0100
> +Subject: [PATCH] build: Fix compilation with --enable-threads
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Previously failed with:
> +
> +havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this function); did you mean ‘BUILD_THREADS’?
> + 190 | *bp++ = BUILD_THREAD;
> + | ^~~~~~~~~~~~
> + | BUILD_THREADS
> +
> +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
> +---
> + src/havegetune.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/havegetune.c b/src/havegetune.c
> +index de39c53..6f14476 100644
> +--- a/src/havegetune.c
> ++++ b/src/havegetune.c
> +@@ -187,7 +187,7 @@ void havege_tune( /* RETURN: none */
> + *bp++ = BUILD_CPUID;
> + #endif
> + #if NUMBER_CORES>1
> +- *bp++ = BUILD_THREAD;
> ++ *bp++ = BUILD_THREADS;
> + #endif
> + #ifdef ONLINE_TESTS_ENABLE
> + *bp++ = BUILD_OLT;
> diff --git a/patches/haveged-1.9.8/series b/patches/haveged-1.9.8/series
> new file mode 100644
> index 000000000..cb49a0968
> --- /dev/null
> +++ b/patches/haveged-1.9.8/series
> @@ -0,0 +1 @@
> +0001-cb1f06-fix-compilation-with-enable-threads.patch
> diff --git a/rules/haveged.make b/rules/haveged.make
> index 80d1910f3..8f49ad49e 100644
> --- a/rules/haveged.make
> +++ b/rules/haveged.make
> @@ -14,16 +14,18 @@ PACKAGES-$(PTXCONF_HAVEGED) += haveged
> #
> # Paths and names
> #
> -HAVEGED_VERSION := 1.9.2
> -HAVEGED_MD5 := fb1d8b3dcbb9d06b30eccd8aa500fd31
> +HAVEGED_VERSION := 1.9.8
> +HAVEGED_MD5 := fba3c88e416ad99ed69849b61fdcaad0
> HAVEGED := haveged-$(HAVEGED_VERSION)
> HAVEGED_SUFFIX := tar.gz
> HAVEGED_URL := \
> - http://www.issihosts.com/haveged/$(HAVEGED).$(HAVEGED_SUFFIX) \
> - http://www.issihosts.com/haveged/archive/$(HAVEGED).$(HAVEGED_SUFFIX)
> + https://github.com/jirka-h/haveged/archive/v$(HAVEGED_VERSION).tar.gz
> HAVEGED_SOURCE := $(SRCDIR)/$(HAVEGED).$(HAVEGED_SUFFIX)
> HAVEGED_DIR := $(BUILDDIR)/$(HAVEGED)
> -HAVEGED_LICENSE := GPL-3.0-only
> +HAVEGED_LICENSE := GPL-3.0-or-later
> +HAVEGED_LICENSE_FILES := \
> + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> + file://src/haveged.c;startline=1;endline=19;md5=772ad7f0aa1fd2230cffdf7be784b15f
>
Reviewed-by: Roland Hieber <rhi@pengutronix.de>
Thanks for adding these! :)
- Roland
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -42,7 +44,7 @@ HAVEGED_CONF_OPT := \
> --enable-initdir=/usr/lib/systemd/system \
> --disable-nistest \
> --disable-olt \
> - --disable-threads \
> + --enable-threads \
> --enable-tune
>
> # ----------------------------------------------------------------------------
> --
> 2.24.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2019-12-10 11:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 10:08 Christian Hermann
2019-12-10 11:12 ` Roland Hieber [this message]
2020-08-13 11:55 ` Alexander Dahl
2020-08-17 14:06 ` Christian Hermann
2020-08-17 14:41 ` Alexander Dahl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191210111216.xi3l3ya6qbvjfvan@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox