From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 04/22] libjitterentropy: update 2.2.0 -> 3.0.0
Date: Mon, 28 Dec 2020 21:04:18 +0100 [thread overview]
Message-ID: <20201228200436.78130-4-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20201228200436.78130-1-alex.kanavin@gmail.com>
License-Update: copyright years
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../0001-Make-man-pages-reproducible.patch | 30 ----------
...akefile-cleanup-install-for-rebuilds.patch | 56 -------------------
...opy_2.2.0.bb => libjitterentropy_3.0.0.bb} | 8 +--
3 files changed, 3 insertions(+), 91 deletions(-)
delete mode 100644 meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch
delete mode 100644 meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch
rename meta/recipes-support/libjitterentropy/{libjitterentropy_2.2.0.bb => libjitterentropy_3.0.0.bb} (79%)
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 @@
-From ce091718716400119d6be6bd637c0e3f4f6ca315 Mon Sep 17 00:00:00 2001
-From: Joshua Watt <JPEWhacker@gmail.com>
-Date: Thu, 21 Nov 2019 08:07:41 -0600
-Subject: [PATCH] Make man pages reproducible
-
-Instructs the man page to be gzip'ed without the file name or timestamp
-so that it builds reproducibly.
-
-Upstream-Status: Backport [https://github.com/smuellerDD/jitterentropy-library/pull/14]
-Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 2e78607..860b720 100644
---- a/Makefile
-+++ b/Makefile
-@@ -60,7 +60,7 @@ cppcheck:
- install:
- install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
- install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
-- gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
-+ gzip -n -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
- install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
- $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
- install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)
---
-2.23.0
-
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 @@
-From 060b9b4147f6e5ff386a8b017796118d783e59fa Mon Sep 17 00:00:00 2001
-From: Matt Weber <matthew.weber@rockwellcollins.com>
-Date: Tue, 22 Oct 2019 12:44:30 -0500
-Subject: [PATCH] Makefile: cleanup install for rebuilds
-
-Support the ability to rebuild and redeploy without a clean. This
-required some force linking and man archive creation.
-
-Provide the ability to override the stripping of the shared lib for
-cases where a embedded target build may want to control stripping
-or provide cross arch tools.
-
-Upstream-Status: Backport [060b9b4147f6e5ff386a8b017796118d783e59fa]
-Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
-Signed-off-by: Stephan Mueller <smueller@chronox.de>
-Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
----
- Makefile | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4ff069b..2e78607 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,6 +14,8 @@ LIBDIR := lib
- # include target directory
- INCDIR := include
-
-+INSTALL_STRIP ?= install -s
-+
- NAME := jitterentropy
- LIBMAJOR=$(shell cat jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}')
- LIBMINOR=$(shell cat jitterentropy-base.c | grep define | grep MINVERSION | awk '{print $$3}')
-@@ -58,15 +60,15 @@ cppcheck:
- install:
- install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
- install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
-- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
-+ gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
- install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
-- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
-+ $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
- install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)
- install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
- install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
- $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
-- ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
-- ln -s lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so
-+ ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
-+ ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so
-
- clean:
- @- $(RM) $(NAME)
---
-2.23.0
-
diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb
similarity index 79%
rename from meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb
rename to 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 \
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=a95aadbdfae7ed812bb2b7b86eb5981c \
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb16b29576d4c43a9dcd6a40fb3310c7 \
file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \
file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \
"
-SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \
- file://0001-Makefile-cleanup-install-for-rebuilds.patch \
- file://0001-Make-man-pages-reproducible.patch"
-SRCREV = "933a44f33ed3d6612f7cfaa7ad1207c8da4886ba"
+SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git"
+SRCREV = "a37e57d9b939d1f93a1b92e1486edd44a3c1cb4c"
S = "${WORKDIR}/git"
do_configure[noexec] = "1"
--
2.29.2
next prev parent reply other threads:[~2020-12-28 20:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 20:04 [PATCH 01/22] devtool: gitsm:// should be handled same as git:// in upgrades Alexander Kanavin
2020-12-28 20:04 ` [PATCH 02/22] ovmf: upgrade 202008 -> 202011 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 03/22] libksba: update 1.4.0 -> 1.5.0 Alexander Kanavin
2020-12-28 20:04 ` Alexander Kanavin [this message]
2020-12-28 20:04 ` [PATCH 05/22] icu: update 68.1 -> 68.2 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 06/22] gnutls: update 3.6.15 -> 3.7.0 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 07/22] gnupg: update 2.2.23 -> 2.2.26 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 08/22] boost: update 1.74.0 -> 1.75.0 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 09/22] kexec-tools: update 2.0.20 -> 2.0.21 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 10/22] vulkan-samples: update to latest revision Alexander Kanavin
2020-12-28 20:04 ` [PATCH 11/22] libpam: update 1.3.1 -> 1.5.1 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 12/22] autotools.bbclass: make it possible to inhibit m4 deletion Alexander Kanavin
2020-12-28 20:04 ` [PATCH 13/22] bash: update 5.0 -> 5.1 Alexander Kanavin
2021-01-07 17:57 ` [OE-core] " Richard Purdie
2021-01-07 18:43 ` Joshua Watt
2021-01-07 19:07 ` Otavio Salvador
2021-01-07 19:10 ` Alexander Kanavin
2021-01-07 21:55 ` Richard Purdie
2020-12-28 20:04 ` [PATCH 14/22] strace: update 5.9 -> 5.10 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 15/22] python3-pytest: update 6.1.2 -> 6.2.1 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 16/22] mtools: update 4.0.25 -> 4.0.26 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 17/22] gnu-config: update to latest revision Alexander Kanavin
2020-12-28 20:04 ` [PATCH 18/22] cmake: update 3.18.4 -> 3.19.2 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 19/22] ccache: upgrade 3.7.11 -> 4.1 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 20/22] ccache.bbclass: use ccache from host distribution Alexander Kanavin
2020-12-28 20:04 ` [PATCH 21/22] runtime_test.py: correct output check for bash 5.1 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 22/22] gawk: add missing ptest dependency Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201228200436.78130-4-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox