summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-08-22 14:50:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-23 08:25:52 +0100
commit2eb889523f7146fe36002779b2cfd3419078ee13 (patch)
tree1aa0e4713b142661f2543d2f9dbbe57be78e65c1 /meta/recipes-support
parent235a906b67eb04f08a9dbfacbd28eb22c6bf2bee (diff)
downloadpoky-2eb889523f7146fe36002779b2cfd3419078ee13.tar.gz
libjitterentropy: update 3.0.2 -> 3.1.0
License-Update: formatting, files renamed. (From OE-Core rev: ea06a05bf00ffc004184faa93a41deee84105f8a) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libjitterentropy/libjitterentropy/0001-Makefile-restore-build-reproducibility.patch27
-rw-r--r--meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb (renamed from meta/recipes-support/libjitterentropy/libjitterentropy_3.0.2.bb)12
2 files changed, 34 insertions, 5 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
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 @@
1From 905333229103510e9dee2fec29b261ccedb031d0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 20 Aug 2021 19:37:04 +0000
4Subject: [PATCH] Makefile: restore build reproducibility
5
6wildcards result in an unpredictable order, and thus different binary outputs
7in otherwise identical builds.
8
9Upstream-Status: Submitted [https://github.com/smuellerDD/jitterentropy-library/pull/67]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/Makefile b/Makefile
16index 42932d8..dfb96a8 100644
17--- a/Makefile
18+++ b/Makefile
19@@ -36,7 +36,7 @@ LIBMINOR=$(shell cat $(SRCDIR)/jitterentropy-base.c | grep define | grep MINVERS
20 LIBPATCH=$(shell cat $(SRCDIR)/jitterentropy-base.c | grep define | grep PATCHLEVEL | awk '{print $$3}')
21 LIBVERSION := $(LIBMAJOR).$(LIBMINOR).$(LIBPATCH)
22
23-C_SRCS := $(wildcard $(SRCDIR)/*.c)
24+C_SRCS := $(sort $(wildcard $(SRCDIR)/*.c))
25 C_OBJS := ${C_SRCS:.c=.o}
26 OBJS := $(C_OBJS)
27
diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.2.bb b/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 \
5all environments and on a lot of CPU architectures." 5all environments and on a lot of CPU architectures."
6HOMEPAGE = "http://www.chronox.de/jent.html" 6HOMEPAGE = "http://www.chronox.de/jent.html"
7LICENSE = "GPLv2+ | BSD" 7LICENSE = "GPLv2+ | BSD"
8LIC_FILES_CHKSUM = "file://COPYING;md5=c69090e97c8fd6372d03099c0a5bc382 \ 8LIC_FILES_CHKSUM = "file://LICENSE;md5=1c94a9d191202a5552f381a023551396 \
9 file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \ 9 file://LICENSE.gplv2;md5=eb723b61539feef013de476e68b5c50a \
10 file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ 10 file://LICENSE.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \
11 " 11 "
12SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git" 12SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \
13SRCREV = "a0c51e21c2d4322681a320a22de5e2ef13c08196" 13 file://0001-Makefile-restore-build-reproducibility.patch \
14 "
15SRCREV = "409828cfccf4b3b07edc40a7840a821ce074e2c3"
14S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
15 17
16do_configure[noexec] = "1" 18do_configure[noexec] = "1"