diff options
Diffstat (limited to 'meta/recipes-support/libjitterentropy')
| -rw-r--r-- | meta/recipes-support/libjitterentropy/libjitterentropy/0001-Makefile-restore-build-reproducibility.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb (renamed from meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb) | 14 |
2 files changed, 4 insertions, 37 deletions
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 <alex.kanavin@gmail.com> -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 <alex.kanavin@gmail.com> ---- - 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.4.1.bb index d9fbb5e9d6..6cef8c068c 100644 --- a/meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb +++ b/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb @@ -4,21 +4,15 @@ 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 \ +LICENSE = "GPL-2.0-or-later | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=64a87180908540620ce364b5e69b3b03 \ 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" +SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;protocol=https" +SRCREV = "4544e11320138ac02797af81766f4476a71bb09f" 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" |