From 615e131198c020fffe399de1ccdfd003c5db893d Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Thu, 21 Nov 2019 10:56:32 -0600 Subject: libjitterentropy: Upgrade 2.1.2 -> 2.2.0 Upstream has a patch that replaces "install -s" with an INSTALL_STRIP make variable, which can be used to replace the custom patch being carried. License checksum change was due to a date in the license text being updated. The actual contents are unchanged. (From OE-Core rev: 0f261c26131b24f2b39c51232132dd9ace546c96) Signed-off-by: Joshua Watt Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...001-Makefile-cleanup-install-for-rebuilds.patch | 56 ++++++++++++++++++++++ .../files/0001-fix-do_install-failure-on-oe.patch | 33 ------------- .../libjitterentropy/libjitterentropy_2.1.2.bb | 28 ----------- .../libjitterentropy/libjitterentropy_2.2.0.bb | 28 +++++++++++ 4 files changed, 84 insertions(+), 61 deletions(-) create mode 100644 meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch delete mode 100644 meta/recipes-support/libjitterentropy/files/0001-fix-do_install-failure-on-oe.patch delete mode 100644 meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb create mode 100644 meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb 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 new file mode 100644 index 0000000000..a19b252293 --- /dev/null +++ b/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 +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: Accepted [060b9b4147f6e5ff386a8b017796118d783e59fa] +Signed-off-by: Matthew Weber +Signed-off-by: Stephan Mueller +Signed-off-by: Joshua Watt +--- + 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/files/0001-fix-do_install-failure-on-oe.patch b/meta/recipes-support/libjitterentropy/files/0001-fix-do_install-failure-on-oe.patch deleted file mode 100644 index 30ff4feb6b..0000000000 --- a/meta/recipes-support/libjitterentropy/files/0001-fix-do_install-failure-on-oe.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 00cefca0eefecec657969b50cd4e1ed5b057a857 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 25 Oct 2018 16:30:06 +0800 -Subject: [PATCH] fix do_install failure on oe - -- Do not strip at do_install - -- Create includedir - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 5e31276..76fcbfa 100644 ---- a/Makefile -+++ b/Makefile -@@ -51,7 +51,8 @@ install: - install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ - gzip -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 -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) --- -2.7.4 - diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb deleted file mode 100644 index 3b5b4e4aa0..0000000000 --- a/meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Hardware RNG based on CPU timing jitter" -DESCRIPTION = "The Jitter RNG provides a noise source using the CPU execution timing jitter. \ -It does not depend on any system resource other than a high-resolution time \ -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=e52365752b36cfcd7f9601d80de7d8c6 \ - file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ - " -SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \ - file://0001-fix-do_install-failure-on-oe.patch \ - " -SRCREV = "f5a80c6f3fcc6deebd0eabf75324f48aed1afbce" -S = "${WORKDIR}/git" - -do_configure[noexec] = "1" - -LDFLAGS += "-Wl,-O0" - -do_install () { - oe_runmake install INCDIR="/include" \ - DESTDIR="${D}" \ - PREFIX="${exec_prefix}" \ - LIBDIR="${baselib}" -} - diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb new file mode 100644 index 0000000000..db8d80e0ed --- /dev/null +++ b/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "Hardware RNG based on CPU timing jitter" +DESCRIPTION = "The Jitter RNG provides a noise source using the CPU execution timing jitter. \ +It does not depend on any system resource other than a high-resolution time \ +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 \ + 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" +SRCREV = "933a44f33ed3d6612f7cfaa7ad1207c8da4886ba" +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" + +LDFLAGS += "-Wl,-O0" + +do_install () { + oe_runmake install INCDIR="/include" \ + DESTDIR="${D}" \ + PREFIX="${exec_prefix}" \ + LIBDIR="${baselib}" \ + INSTALL_STRIP="install" +} + -- cgit v1.2.3-54-g00ecf