diff options
Diffstat (limited to 'poky/meta/recipes-support/libjitterentropy')
| -rw-r--r-- | poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch | 30 | ||||
| -rw-r--r-- | poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch | 56 | ||||
| -rw-r--r-- | poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb (renamed from poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb) | 8 |
3 files changed, 91 insertions, 3 deletions
diff --git a/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch b/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch new file mode 100644 index 000000000..57b336c0c --- /dev/null +++ b/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch @@ -0,0 +1,30 @@ +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/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch b/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch new file mode 100644 index 000000000..9af334ce2 --- /dev/null +++ b/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch @@ -0,0 +1,56 @@ +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/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb b/poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb index 953ecfd05..710ef0172 100644 --- a/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb +++ b/poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.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=fb16b29576d4c43a9dcd6a40fb3310c7 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=a95aadbdfae7ed812bb2b7b86eb5981c \ file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ " -SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git" -SRCREV = "a37e57d9b939d1f93a1b92e1486edd44a3c1cb4c" +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" S = "${WORKDIR}/git" do_configure[noexec] = "1" |