From 878ca97e7addff438c7ea07ab166d1192b5c0bc1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 19 Oct 2021 17:33:15 +0200 Subject: libjitterentropy: update 3.1.0 -> 3.3.0 (From OE-Core rev: 3d27221475a58a27f2b5bc0f4c8c2d773dfb9a98) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...01-Makefile-restore-build-reproducibility.patch | 27 ------------------ .../libjitterentropy/libjitterentropy_3.1.0.bb | 33 ---------------------- .../libjitterentropy/libjitterentropy_3.3.0.bb | 30 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-support/libjitterentropy/libjitterentropy/0001-Makefile-restore-build-reproducibility.patch delete mode 100644 meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb create mode 100644 meta/recipes-support/libjitterentropy/libjitterentropy_3.3.0.bb (limited to 'meta') diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy/0001-Makefile-restore-build-reproducibility.patch b/meta/recipes-support/libjitterentropy/libjitterentropy/0001-Makefile-restore-build-reproducibility.patch deleted file mode 100644 index 3290ff7b18..0000000000 --- a/meta/recipes-support/libjitterentropy/libjitterentropy/0001-Makefile-restore-build-reproducibility.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 905333229103510e9dee2fec29b261ccedb031d0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 20 Aug 2021 19:37:04 +0000 -Subject: [PATCH] Makefile: restore build reproducibility - -wildcards result in an unpredictable order, and thus different binary outputs -in otherwise identical builds. - -Upstream-Status: Submitted [https://github.com/smuellerDD/jitterentropy-library/pull/67] -Signed-off-by: Alexander Kanavin ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 42932d8..dfb96a8 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ LIBMINOR=$(shell cat $(SRCDIR)/jitterentropy-base.c | grep define | grep MINVERS - LIBPATCH=$(shell cat $(SRCDIR)/jitterentropy-base.c | grep define | grep PATCHLEVEL | awk '{print $$3}') - LIBVERSION := $(LIBMAJOR).$(LIBMINOR).$(LIBPATCH) - --C_SRCS := $(wildcard $(SRCDIR)/*.c) -+C_SRCS := $(sort $(wildcard $(SRCDIR)/*.c)) - C_OBJS := ${C_SRCS:.c=.o} - OBJS := $(C_OBJS) - diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb deleted file mode 100644 index d9fbb5e9d6..0000000000 --- a/meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Hardware RNG based on CPU timing jitter" -DESCRIPTION = "The Jitter RNG provides a noise source using the CPU execution timing jitter. \ -It does not depend on any system resource other than a high-resolution time \ -stamp. It is a small-scale, yet fast entropy source that is viable in almost \ -all environments and on a lot of CPU architectures." -HOMEPAGE = "http://www.chronox.de/jent.html" -LICENSE = "GPLv2+ | BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1c94a9d191202a5552f381a023551396 \ - file://LICENSE.gplv2;md5=eb723b61539feef013de476e68b5c50a \ - file://LICENSE.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ - " -SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \ - file://0001-Makefile-restore-build-reproducibility.patch \ - " -SRCREV = "409828cfccf4b3b07edc40a7840a821ce074e2c3" -S = "${WORKDIR}/git" - -# remove at next version upgrade or when output changes -PR = "r1" -HASHEQUIV_HASH_VERSION .= ".2" - -do_configure[noexec] = "1" - -LDFLAGS += "-Wl,-O0" - -do_install () { - oe_runmake install INCDIR="/include" \ - DESTDIR="${D}" \ - PREFIX="${exec_prefix}" \ - LIBDIR="${baselib}" \ - INSTALL_STRIP="install" -} - diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_3.3.0.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.3.0.bb new file mode 100644 index 0000000000..dae2fb1791 --- /dev/null +++ b/meta/recipes-support/libjitterentropy/libjitterentropy_3.3.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "Hardware RNG based on CPU timing jitter" +DESCRIPTION = "The Jitter RNG provides a noise source using the CPU execution timing jitter. \ +It does not depend on any system resource other than a high-resolution time \ +stamp. It is a small-scale, yet fast entropy source that is viable in almost \ +all environments and on a lot of CPU architectures." +HOMEPAGE = "http://www.chronox.de/jent.html" +LICENSE = "GPLv2+ | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1c94a9d191202a5552f381a023551396 \ + file://LICENSE.gplv2;md5=eb723b61539feef013de476e68b5c50a \ + file://LICENSE.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ + " +SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git" +SRCREV = "418c1e64231255aec2167cbb20aab62a0863415d" +S = "${WORKDIR}/git" + +# remove at next version upgrade or when output changes +HASHEQUIV_HASH_VERSION .= ".2" + +do_configure[noexec] = "1" + +LDFLAGS += "-Wl,-O0" + +do_install () { + oe_runmake install INCDIR="/include" \ + DESTDIR="${D}" \ + PREFIX="${exec_prefix}" \ + LIBDIR="${baselib}" \ + INSTALL_STRIP="install" +} + -- cgit v1.2.3-54-g00ecf