summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-10-19 17:33:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-23 17:42:25 +0100
commit878ca97e7addff438c7ea07ab166d1192b5c0bc1 (patch)
tree29d3aed5b543363be081db76036cc4c8d0c6483b /meta/recipes-support
parentbdc84d86aa606096c99a4170612691ac0d990e8d (diff)
downloadpoky-878ca97e7addff438c7ea07ab166d1192b5c0bc1.tar.gz
libjitterentropy: update 3.1.0 -> 3.3.0
(From OE-Core rev: 3d27221475a58a27f2b5bc0f4c8c2d773dfb9a98) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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.3.0.bb (renamed from meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb)7
2 files changed, 2 insertions, 32 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 @@
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.1.0.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.3.0.bb
index d9fbb5e9d6..dae2fb1791 100644
--- a/meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb
+++ b/meta/recipes-support/libjitterentropy/libjitterentropy_3.3.0.bb
@@ -9,14 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1c94a9d191202a5552f381a023551396 \
9 file://LICENSE.gplv2;md5=eb723b61539feef013de476e68b5c50a \ 9 file://LICENSE.gplv2;md5=eb723b61539feef013de476e68b5c50a \
10 file://LICENSE.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"
13 file://0001-Makefile-restore-build-reproducibility.patch \ 13SRCREV = "418c1e64231255aec2167cbb20aab62a0863415d"
14 "
15SRCREV = "409828cfccf4b3b07edc40a7840a821ce074e2c3"
16S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
17 15
18# remove at next version upgrade or when output changes 16# remove at next version upgrade or when output changes
19PR = "r1"
20HASHEQUIV_HASH_VERSION .= ".2" 17HASHEQUIV_HASH_VERSION .= ".2"
21 18
22do_configure[noexec] = "1" 19do_configure[noexec] = "1"