summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-11-21 10:56:32 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-25 17:57:23 +0000
commit615e131198c020fffe399de1ccdfd003c5db893d (patch)
treeb7b84c367de54bda0db7f3e37d3b7e19a66fe4c0 /meta/recipes-support
parent827f4e2755cf1c8d0ed449deff433aae0560b5f8 (diff)
downloadpoky-615e131198c020fffe399de1ccdfd003c5db893d.tar.gz
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 <JPEWhacker@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch56
-rw-r--r--meta/recipes-support/libjitterentropy/files/0001-fix-do_install-failure-on-oe.patch33
-rw-r--r--meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb (renamed from meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb)12
3 files changed, 62 insertions, 39 deletions
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 @@
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: Accepted [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/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 @@
1From 00cefca0eefecec657969b50cd4e1ed5b057a857 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 25 Oct 2018 16:30:06 +0800
4Subject: [PATCH] fix do_install failure on oe
5
6- Do not strip at do_install
7
8- Create includedir
9
10Upstream-Status: Pending
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 Makefile | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17diff --git a/Makefile b/Makefile
18index 5e31276..76fcbfa 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -51,7 +51,8 @@ install:
22 install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
23 gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
24 install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
25- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
26+ install -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
27+ install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)/
28 install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
29 install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
30 $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
31--
322.7.4
33
diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb
index 3b5b4e4aa0..db8d80e0ed 100644
--- a/meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb
+++ b/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb
@@ -5,14 +5,13 @@ 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=e52365752b36cfcd7f9601d80de7d8c6 \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=a95aadbdfae7ed812bb2b7b86eb5981c \
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-fix-do_install-failure-on-oe.patch \ 13 file://0001-Makefile-cleanup-install-for-rebuilds.patch"
14 " 14SRCREV = "933a44f33ed3d6612f7cfaa7ad1207c8da4886ba"
15SRCREV = "f5a80c6f3fcc6deebd0eabf75324f48aed1afbce"
16S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
17 16
18do_configure[noexec] = "1" 17do_configure[noexec] = "1"
@@ -23,6 +22,7 @@ do_install () {
23 oe_runmake install INCDIR="/include" \ 22 oe_runmake install INCDIR="/include" \
24 DESTDIR="${D}" \ 23 DESTDIR="${D}" \
25 PREFIX="${exec_prefix}" \ 24 PREFIX="${exec_prefix}" \
26 LIBDIR="${baselib}" 25 LIBDIR="${baselib}" \
26 INSTALL_STRIP="install"
27} 27}
28 28