summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libjitterentropy
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-12-28 21:04:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-31 11:53:26 +0000
commit200a4edd206f16a805c1ee1e24daa7a41d9f2153 (patch)
treef155268737f96668dcc9c654c60bf7fa6e7bfc2e /meta/recipes-support/libjitterentropy
parent6dc66753079ed2b4f022608d41f0d3659ac75004 (diff)
downloadpoky-200a4edd206f16a805c1ee1e24daa7a41d9f2153.tar.gz
libjitterentropy: update 2.2.0 -> 3.0.0
License-Update: copyright years (From OE-Core rev: b1b1ad309dd1a710d1352e3614eb155d44fecd52) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libjitterentropy')
-rw-r--r--meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch30
-rw-r--r--meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch56
-rw-r--r--meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb (renamed from meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb)8
3 files changed, 3 insertions, 91 deletions
diff --git a/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch b/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch
deleted file mode 100644
index 57b336c0c0..0000000000
--- a/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From ce091718716400119d6be6bd637c0e3f4f6ca315 Mon Sep 17 00:00:00 2001
2From: Joshua Watt <JPEWhacker@gmail.com>
3Date: Thu, 21 Nov 2019 08:07:41 -0600
4Subject: [PATCH] Make man pages reproducible
5
6Instructs the man page to be gzip'ed without the file name or timestamp
7so that it builds reproducibly.
8
9Upstream-Status: Backport [https://github.com/smuellerDD/jitterentropy-library/pull/14]
10Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
11---
12 Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/Makefile b/Makefile
16index 2e78607..860b720 100644
17--- a/Makefile
18+++ b/Makefile
19@@ -60,7 +60,7 @@ cppcheck:
20 install:
21 install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
22 install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
23- gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
24+ gzip -n -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
25 install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
26 $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
27 install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)
28--
292.23.0
30
diff --git a/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch b/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch
deleted file mode 100644
index 9af334ce2c..0000000000
--- a/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 060b9b4147f6e5ff386a8b017796118d783e59fa Mon Sep 17 00:00:00 2001
2From: Matt Weber <matthew.weber@rockwellcollins.com>
3Date: Tue, 22 Oct 2019 12:44:30 -0500
4Subject: [PATCH] Makefile: cleanup install for rebuilds
5
6Support the ability to rebuild and redeploy without a clean. This
7required some force linking and man archive creation.
8
9Provide the ability to override the stripping of the shared lib for
10cases where a embedded target build may want to control stripping
11or provide cross arch tools.
12
13Upstream-Status: Backport [060b9b4147f6e5ff386a8b017796118d783e59fa]
14Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
15Signed-off-by: Stephan Mueller <smueller@chronox.de>
16Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
17---
18 Makefile | 10 ++++++----
19 1 file changed, 6 insertions(+), 4 deletions(-)
20
21diff --git a/Makefile b/Makefile
22index 4ff069b..2e78607 100644
23--- a/Makefile
24+++ b/Makefile
25@@ -14,6 +14,8 @@ LIBDIR := lib
26 # include target directory
27 INCDIR := include
28
29+INSTALL_STRIP ?= install -s
30+
31 NAME := jitterentropy
32 LIBMAJOR=$(shell cat jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}')
33 LIBMINOR=$(shell cat jitterentropy-base.c | grep define | grep MINVERSION | awk '{print $$3}')
34@@ -58,15 +60,15 @@ cppcheck:
35 install:
36 install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
37 install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
38- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
39+ gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
40 install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
41- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
42+ $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
43 install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)
44 install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
45 install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
46 $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
47- ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
48- ln -s lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so
49+ ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
50+ ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so
51
52 clean:
53 @- $(RM) $(NAME)
54--
552.23.0
56
diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb
index 710ef0172d..953ecfd055 100644
--- a/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb
+++ b/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb
@@ -5,14 +5,12 @@ 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=a95aadbdfae7ed812bb2b7b86eb5981c \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=fb16b29576d4c43a9dcd6a40fb3310c7 \
9 file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \ 9 file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \
10 file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ 10 file://COPYING.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-cleanup-install-for-rebuilds.patch \ 13SRCREV = "a37e57d9b939d1f93a1b92e1486edd44a3c1cb4c"
14 file://0001-Make-man-pages-reproducible.patch"
15SRCREV = "933a44f33ed3d6612f7cfaa7ad1207c8da4886ba"
16S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
17 15
18do_configure[noexec] = "1" 16do_configure[noexec] = "1"