diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2019-11-21 10:56:32 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-25 17:57:23 +0000 |
commit | 615e131198c020fffe399de1ccdfd003c5db893d (patch) | |
tree | b7b84c367de54bda0db7f3e37d3b7e19a66fe4c0 /meta/recipes-support/libjitterentropy/files | |
parent | 827f4e2755cf1c8d0ed449deff433aae0560b5f8 (diff) | |
download | poky-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/libjitterentropy/files')
2 files changed, 56 insertions, 33 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 @@ | |||
1 | From 060b9b4147f6e5ff386a8b017796118d783e59fa Mon Sep 17 00:00:00 2001 | ||
2 | From: Matt Weber <matthew.weber@rockwellcollins.com> | ||
3 | Date: Tue, 22 Oct 2019 12:44:30 -0500 | ||
4 | Subject: [PATCH] Makefile: cleanup install for rebuilds | ||
5 | |||
6 | Support the ability to rebuild and redeploy without a clean. This | ||
7 | required some force linking and man archive creation. | ||
8 | |||
9 | Provide the ability to override the stripping of the shared lib for | ||
10 | cases where a embedded target build may want to control stripping | ||
11 | or provide cross arch tools. | ||
12 | |||
13 | Upstream-Status: Accepted [060b9b4147f6e5ff386a8b017796118d783e59fa] | ||
14 | Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> | ||
15 | Signed-off-by: Stephan Mueller <smueller@chronox.de> | ||
16 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
17 | --- | ||
18 | Makefile | 10 ++++++---- | ||
19 | 1 file changed, 6 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/Makefile b/Makefile | ||
22 | index 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 | -- | ||
55 | 2.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 @@ | |||
1 | From 00cefca0eefecec657969b50cd4e1ed5b057a857 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Thu, 25 Oct 2018 16:30:06 +0800 | ||
4 | Subject: [PATCH] fix do_install failure on oe | ||
5 | |||
6 | - Do not strip at do_install | ||
7 | |||
8 | - Create includedir | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
13 | --- | ||
14 | Makefile | 3 ++- | ||
15 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/Makefile b/Makefile | ||
18 | index 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 | -- | ||
32 | 2.7.4 | ||
33 | |||