License-Update: formatting, files renamed. Signed-off-by: Alexander Kanavin <[email protected]> --- ...kefile-restore-build-reproducibility.patch | 27 +++++++++++++++++++ ...opy_3.0.2.bb => libjitterentropy_3.1.0.bb} | 12 +++++---- 2 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-support/libjitterentropy/libjitterentropy/0001-Makefile-restore-build-reproducibility.patch rename meta/recipes-support/libjitterentropy/{libjitterentropy_3.0.2.bb => libjitterentropy_3.1.0.bb} (71%)
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 new file mode 100644 index 0000000000..3290ff7b18 --- /dev/null +++ b/meta/recipes-support/libjitterentropy/libjitterentropy/0001-Makefile-restore-build-reproducibility.patch @@ -0,0 +1,27 @@ +From 905333229103510e9dee2fec29b261ccedb031d0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +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 <[email protected]> +--- + 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.0.2.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb similarity index 71% rename from meta/recipes-support/libjitterentropy/libjitterentropy_3.0.2.bb rename to meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb index 8e39974ef3..de51ed8fc6 100644 --- a/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.2.bb +++ b/meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb @@ -5,12 +5,14 @@ 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" -LIC_FILES_CHKSUM = "file://COPYING;md5=c69090e97c8fd6372d03099c0a5bc382 \ - file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ +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 = "a0c51e21c2d4322681a320a22de5e2ef13c08196" +SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \ + file://0001-Makefile-restore-build-reproducibility.patch \ + " +SRCREV = "409828cfccf4b3b07edc40a7840a821ce074e2c3" S = "${WORKDIR}/git" do_configure[noexec] = "1" -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155089): https://lists.openembedded.org/g/openembedded-core/message/155089 Mute This Topic: https://lists.openembedded.org/mt/85060393/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
