Skip to contentSkip to conversation

package/jitterentropy-library: bump to version 2.2.0

PATCH New Fabrice Fontaine 3 participants 7 messages Oct 24, 2019 – Oct 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/jitterentropy-library: bump to version 2.2.0

- Refresh patch
- Update hash of COPYING (date updated, see
https://github.com/smuellerDD/jitterentropy-library/commit/ab33ee759ff09a1c9b1184fb2e4614d82c355c2f)

---
 .../0001-Makefile-cleanup-install.patch       | 27 +++++++++----------
 .../jitterentropy-library.hash                |  4 +--
 .../jitterentropy-library.mk                  |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)
package/jitterentropy-library/0001-Makefile-cleanup-install.patch +13 -14
index 7d209008c9..9c7e40369a 100644
@@ -1,24 +1,26 @@
-From 83b1d46ae48eed576cf3dff0ffd7e772c8e638e4 Mon Sep 17 00:00:00 2001
+From 060b9b4147f6e5ff386a8b017796118d783e59fa Mon Sep 17 00:00:00 2001
 From: Matt Weber <[email protected]>
-Date: Mon, 9 Sep 2019 20:42:14 -0500
-Subject: [PATCH] Makefile: cleanup install
+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 forced man archive creation.
+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: https://github.com/smuellerDD/jitterentropy-library/pull/10
-
 Signed-off-by: Matthew Weber <[email protected]>
+Signed-off-by: Stephan Mueller <[email protected]>
+[Retrieved from:
+https://github.com/smuellerDD/jitterentropy-library/commit/060b9b4147f6e5ff386a8b017796118d783e59fa]
+Signed-off-by: Fabrice Fontaine <[email protected]>
 ---
- Makefile | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
+ Makefile | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 5e31276..a575f32 100644
+index 4ff069b..2e78607 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -14,6 +14,8 @@ LIBDIR := lib
@@ -30,7 +32,7 @@ index 5e31276..a575f32 100644
  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}')
-@@ -49,14 +51,15 @@ scan:	$(OBJS)
+@@ -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/
@@ -39,7 +41,7 @@ index 5e31276..a575f32 100644
  	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 -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)
@@ -50,6 +52,3 @@ index 5e31276..a575f32 100644
  
  clean:
  	@- $(RM) $(NAME)
--- 
-2.17.1
-
package/jitterentropy-library/jitterentropy-library.hash +2 -2
index 5846f2147d..5ff38f6fea 100644
@@ -1,5 +1,5 @@
 # Locally computed
-sha256	38519115c6b750b7fa15547826123a7821b271535c168823259e609b42847223  jitterentropy-library-2.1.2.tar.gz
-sha256	c3352794eff829a3c8097b77e4cbc9f1faf5c3f47a8abed960a0f411cbc6ab9f  COPYING
+sha256	42d4bd1050b5f0d7b45b5453e5b6cfc45c0492bb428791f571d8f69b066351a4  jitterentropy-library-2.2.0.tar.gz
+sha256	96b5a6b49aaeeba9036f9b80e6e299d613a8eca158741a25a67dc78792413e23  COPYING
 sha256	13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239  COPYING.bsd
 sha256	e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4  COPYING.gplv2
package/jitterentropy-library/jitterentropy-library.mk +1 -1
index 4e791e19dd..7ce52aa9ad 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JITTERENTROPY_LIBRARY_VERSION = 2.1.2
+JITTERENTROPY_LIBRARY_VERSION = 2.2.0
 JITTERENTROPY_LIBRARY_SITE = $(call github,smuellerDD,$(JITTERENTROPY_LIBRARY_NAME),v$(JITTERENTROPY_LIBRARY_VERSION))
 JITTERENTROPY_LIBRARY_LICENSE = GPL-2.0 or BSD-3-Clause
 JITTERENTROPY_LIBRARY_LICENSE_FILES = COPYING COPYING.bsd COPYING.gplv2
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/2 package/jitterentropy-library: fix static build

Fixes:
- http://autobuild.buildroot.org/results/27b19c964c4457dca69639e1913ce44f010853ac

---
 ...efile-add-additional-install-targets.patch | 56 +++++++++++++++++++
 .../jitterentropy-library.mk                  | 24 +++++++-
 2 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch
package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch new file +56 -0
new file mode 100644
index 0000000000..a331c9f33b
@@ -0,0 +1,56 @@
+From d545d76cb3173cc98e1421604929248f2d882821 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Thu, 24 Oct 2019 18:48:47 +0200
+Subject: [PATCH] Makefile: add additional install targets
+
+Add install-includes, install-man, install-shared and install-static
+targets to allow the user to configure what must be installed
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status:
+https://github.com/smuellerDD/jitterentropy-library/pull/11]
+---
+ Makefile | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2e78607..41bc4f7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -57,19 +57,29 @@ scan: $(analyze_plists)
+ cppcheck:
+ 	cppcheck --force -q --enable=performance --enable=warning --enable=portability *.h *.c
+ 
+-install:
++install: install-man install-shared install-includes
++
++install-man:
+ 	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
++
++install-shared:
+ 	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)
+-	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 -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
+ 	ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so
+ 
++install-includes:
++	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)/
++
++install-static:
++	install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	install -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/
++
+ clean:
+ 	@- $(RM) $(NAME)
+ 	@- $(RM) $(OBJS)
+-- 
+2.23.0
+
package/jitterentropy-library/jitterentropy-library.mk +21 -3
index 7ce52aa9ad..a8e15ce792 100644
@@ -9,17 +9,35 @@ JITTERENTROPY_LIBRARY_SITE = $(call github,smuellerDD,$(JITTERENTROPY_LIBRARY_NA
 JITTERENTROPY_LIBRARY_LICENSE = GPL-2.0 or BSD-3-Clause
 JITTERENTROPY_LIBRARY_LICENSE_FILES = COPYING COPYING.bsd COPYING.gplv2
 JITTERENTROPY_LIBRARY_INSTALL_STAGING = YES
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS = install-includes
+
+ifeq ($(BR2_STATIC_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy-static
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-static
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy jitterentropy-static
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-shared install-static
+else ifeq ($(BR2_SHARED_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-shared
+endif
+
 
 define JITTERENTROPY_LIBRARY_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+		$(JITTERENTROPY_LIBRARY_BUILD_TARGETS)
 endef
 
 define JITTERENTROPY_LIBRARY_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) INSTALL_STRIP="install" PREFIX=/usr install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) \
+		INSTALL_STRIP="install" PREFIX=/usr \
+		$(JITTERENTROPY_LIBRARY_INSTALL_TARGETS)
 endef
 
 define JITTERENTROPY_LIBRARY_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) INSTALL_STRIP="install" PREFIX=/usr install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \
+		INSTALL_STRIP="install" PREFIX=/usr \
+		$(JITTERENTROPY_LIBRARY_INSTALL_TARGETS)
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.23.0
#2 lore raw

PATCH 2/2 package/jitterentropy-library: fix static build

Fabrice,

Quoted 17 lines · Fabrice Fontaine

Fixes:
- http://autobuild.buildroot.org/results/27b19c964c4457dca69639e1913ce44f010853ac

---
 ...efile-add-additional-install-targets.patch | 56 +++++++++++++++++++
 .../jitterentropy-library.mk                  | 24 +++++++-
 2 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch
package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch new file +0 -0
new file mode 100644
index 0000000000..a331c9f33b

package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch line 4

Quoted 4 lines
package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch new file +4 -0
@@ -0,0 +1,56 @@
+From d545d76cb3173cc98e1421604929248f2d882821 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Thu, 24 Oct 2019 18:48:47 +0200
+Subject: [PATCH] Makefile: add additional install targets

Thanks for breaking it out further

Quoted 67 lines
package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch new file +52 -0
+
+Add install-includes, install-man, install-shared and install-static
+targets to allow the user to configure what must be installed
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status:
+https://github.com/smuellerDD/jitterentropy-library/pull/11]
+---
+ Makefile | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2e78607..41bc4f7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -57,19 +57,29 @@ scan: $(analyze_plists)
+ cppcheck:
+       cppcheck --force -q --enable=performance --enable=warning --enable=portability *.h *.c
+
+-install:
++install: install-man install-shared install-includes
++
++install-man:
+       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
++
++install-shared:
+       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)
+-      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 -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
+       ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so
+
++install-includes:
++      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)/
++
++install-static:
++      install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
++      install -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/
++
+ clean:
+       @- $(RM) $(NAME)
+       @- $(RM) $(OBJS)
+--
+2.23.0
+
package/jitterentropy-library/jitterentropy-library.mk +7 -0
index 7ce52aa9ad..a8e15ce792 100644
@@ -9,17 +9,35 @@ JITTERENTROPY_LIBRARY_SITE = $(call github,smuellerDD,$(JITTERENTROPY_LIBRARY_NA
 JITTERENTROPY_LIBRARY_LICENSE = GPL-2.0 or BSD-3-Clause
 JITTERENTROPY_LIBRARY_LICENSE_FILES = COPYING COPYING.bsd COPYING.gplv2
 JITTERENTROPY_LIBRARY_INSTALL_STAGING = YES
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS = install-includes
+
+ifeq ($(BR2_STATIC_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy-static
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-static
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy jitterentropy-static

package/jitterentropy-library/jitterentropy-library.mk JITTERENTROPY_LIBRARY_SITE = $(call github,smuellerDD,$(JITTERENTROPY_LIBRARY_NA · line 27

Quoted 10 lines
package/jitterentropy-library/jitterentropy-library.mk +7 -1
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-shared install-static
+else ifeq ($(BR2_SHARED_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-shared
+endif
+
 
 define JITTERENTROPY_LIBRARY_BUILD_CMDS
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \

I believe you want to move $(TARGET_CONFIGURE_OPTS) before $(MAKE) to fix the autobuild mentioned above.

Quoted 21 lines
package/jitterentropy-library/jitterentropy-library.mk +7 -3
+               $(JITTERENTROPY_LIBRARY_BUILD_TARGETS)
 endef
 
 define JITTERENTROPY_LIBRARY_INSTALL_STAGING_CMDS
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) INSTALL_STRIP="install" PREFIX=/usr install
+       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) \
+               INSTALL_STRIP="install" PREFIX=/usr \
+               $(JITTERENTROPY_LIBRARY_INSTALL_TARGETS)
 endef
 
 define JITTERENTROPY_LIBRARY_INSTALL_TARGET_CMDS
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) INSTALL_STRIP="install" PREFIX=/usr install
+       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \
+               INSTALL_STRIP="install" PREFIX=/usr \
+               $(JITTERENTROPY_LIBRARY_INSTALL_TARGETS)
 endef
 
 $(eval $(generic-package))
--

2.23.0

Signature · 23 lines
Matthew Weber | Associate Director Software Engineer | Commercial Avionics

COLLINS AEROSPACE

400 Collins Road NE, Cedar Rapids, Iowa 52498, USA

Tel: +1 319 295 7349 | FAX: +1 319 263 6099

matthew.weber at collins.com | collinsaerospace.com



CONFIDENTIALITY WARNING: This message may contain proprietary and/or
privileged information of Collins Aerospace and its affiliated
companies. If you are not the intended recipient, please 1) Do not
disclose, copy, distribute or use this message or its contents. 2)
Advise the sender by return email. 3) Delete all copies (including all
attachments) from your computer. Your cooperation is greatly
appreciated.


Any export restricted material should be shared using my
matthew.weber at corp.rockwellcollins.com address.
#3 lore raw

PATCH 2/2 package/jitterentropy-library: fix static build

Fabrice,

Quoted 10 lines · Matthew Weber

Fabrice,

Quoted 5 lines · Fabrice Fontaine

Fixes:
- http://autobuild.buildroot.org/results/27b19c964c4457dca69639e1913ce44f010853ac

- I tailored the config for a static only, shared only and both
- Verified the installed library file location for each config case
- Checked that rng-tools could detect the jitter library as part of the configure step for each configuration

Quoted 93 lines
Quoted 12 lines
---
 ...efile-add-additional-install-targets.patch | 56 +++++++++++++++++++
 .../jitterentropy-library.mk                  | 24 +++++++-
 2 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch
package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch new file +0 -0
new file mode 100644
index 0000000000..a331c9f33b

package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch line 4

Quoted 4 lines
package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch new file +4 -0
@@ -0,0 +1,56 @@
+From d545d76cb3173cc98e1421604929248f2d882821 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Thu, 24 Oct 2019 18:48:47 +0200
+Subject: [PATCH] Makefile: add additional install targets

Thanks for breaking it out further

Quoted 74 lines
package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch new file +52 -0
+
+Add install-includes, install-man, install-shared and install-static
+targets to allow the user to configure what must be installed
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status:
+https://github.com/smuellerDD/jitterentropy-library/pull/11]
+---
+ Makefile | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2e78607..41bc4f7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -57,19 +57,29 @@ scan: $(analyze_plists)
+ cppcheck:
+       cppcheck --force -q --enable=performance --enable=warning --enable=portability *.h *.c
+
+-install:
++install: install-man install-shared install-includes
++
++install-man:
+       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
++
++install-shared:
+       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)
+-      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 -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
+       ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so
+
++install-includes:
++      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)/
++
++install-static:
++      install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
++      install -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/
++
+ clean:
+       @- $(RM) $(NAME)
+       @- $(RM) $(OBJS)
+--
+2.23.0
+
package/jitterentropy-library/jitterentropy-library.mk +13 -0
index 7ce52aa9ad..a8e15ce792 100644
@@ -9,17 +9,35 @@ JITTERENTROPY_LIBRARY_SITE = $(call github,smuellerDD,$(JITTERENTROPY_LIBRARY_NA
 JITTERENTROPY_LIBRARY_LICENSE = GPL-2.0 or BSD-3-Clause
 JITTERENTROPY_LIBRARY_LICENSE_FILES = COPYING COPYING.bsd COPYING.gplv2
 JITTERENTROPY_LIBRARY_INSTALL_STAGING = YES
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS = install-includes
+
+ifeq ($(BR2_STATIC_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy-static
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-static
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy jitterentropy-static
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-shared install-static
+else ifeq ($(BR2_SHARED_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-shared
+endif
+
 
Quoted 6 lines

package/jitterentropy-library/jitterentropy-library.mk JITTERENTROPY_LIBRARY_SITE = $(call github,smuellerDD,$(JITTERENTROPY_LIBRARY_NA · line 27

Quoted 3 lines
package/jitterentropy-library/jitterentropy-library.mk +1 -1
 define JITTERENTROPY_LIBRARY_BUILD_CMDS
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \

I believe you want to move $(TARGET_CONFIGURE_OPTS) before $(MAKE) to fix the autobuild mentioned above.

Oops, the autobuild failure I was referring to was not the one above but this fPIC one but the following.
http://autobuild.buildroot.net/results/505/5059207ec9ab0b502717626cc84956dafd0c3c32/

The order of TARGET_CONFIGURE_OPTS is still an issue but would be a refactor of the following series
http://patchwork.ozlabs.org/patch/1182068/

Quoted 49 lines
Quoted 20 lines
package/jitterentropy-library/jitterentropy-library.mk +7 -3
+               $(JITTERENTROPY_LIBRARY_BUILD_TARGETS)
 endef
 
 define JITTERENTROPY_LIBRARY_INSTALL_STAGING_CMDS
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) INSTALL_STRIP="install" PREFIX=/usr install
+       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) \
+               INSTALL_STRIP="install" PREFIX=/usr \
+               $(JITTERENTROPY_LIBRARY_INSTALL_TARGETS)
 endef
 
 define JITTERENTROPY_LIBRARY_INSTALL_TARGET_CMDS
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) INSTALL_STRIP="install" PREFIX=/usr install
+       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \
+               INSTALL_STRIP="install" PREFIX=/usr \
+               $(JITTERENTROPY_LIBRARY_INSTALL_TARGETS)
 endef
 
 $(eval $(generic-package))
--
Quoted 2 lines

2.23.0

--

Matthew Weber | Associate Director Software Engineer | Commercial Avionics

COLLINS AEROSPACE

400 Collins Road NE, Cedar Rapids, Iowa 52498, USA

Tel: +1 319 295 7349 | FAX: +1 319 263 6099

matthew.weber at collins.com | collinsaerospace.com

CONFIDENTIALITY WARNING: This message may contain proprietary and/or privileged information of Collins Aerospace and its affiliated companies. If you are not the intended recipient, please 1) Do not disclose, copy, distribute or use this message or its contents. 2) Advise the sender by return email. 3) Delete all copies (including all attachments) from your computer. Your cooperation is greatly appreciated.

Any export restricted material should be shared using my matthew.weber at corp.rockwellcollins.com address.

Signature · 23 lines
Matthew Weber | Associate Director Software Engineer | Commercial Avionics

COLLINS AEROSPACE

400 Collins Road NE, Cedar Rapids, Iowa 52498, USA

Tel: +1 319 295 7349 | FAX: +1 319 263 6099

matthew.weber at collins.com | collinsaerospace.com



CONFIDENTIALITY WARNING: This message may contain proprietary and/or
privileged information of Collins Aerospace and its affiliated
companies. If you are not the intended recipient, please 1) Do not
disclose, copy, distribute or use this message or its contents. 2)
Advise the sender by return email. 3) Delete all copies (including all
attachments) from your computer. Your cooperation is greatly
appreciated.


Any export restricted material should be shared using my
matthew.weber at corp.rockwellcollins.com address.
#4 lore raw

PATCH 2/2 package/jitterentropy-library: fix static build

In reply to Fabrice Fontaine

package/jitterentropy-library/jitterentropy-library.mk JITTERENTROPY_LIBRARY_SITE = $(call github,smuellerDD,$(JITTERENTROPY_LIBRARY_NA · line 23

Quoted 10 lines · On Thu, 24 Oct 2019 18:59:13 +0200 Fabrice Fontaine…
package/jitterentropy-library/jitterentropy-library.mk +10 -0
+ifeq ($(BR2_STATIC_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy-static
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-static
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy jitterentropy-static
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-shared install-static
+else ifeq ($(BR2_SHARED_LIBS),y)
+JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy
+JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-shared
+endif

This can be written in a slightly shorter way:

+ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy-static +JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-static +endif
+
+ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy +JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-shared +endif

So I changed it to that, and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 1/2 package/jitterentropy-library: bump to version 2.2.0

In reply to Fabrice Fontaine

Fabrice,

Quoted 6 lines · Fabrice Fontaine

- Refresh patch
- Update hash of COPYING (date updated, see
https://github.com/smuellerDD/jitterentropy-library/commit/ab33ee759ff09a1c9b1184fb2e4614d82c355c2f)

Quoted 97 lines
---
 .../0001-Makefile-cleanup-install.patch       | 27 +++++++++----------
 .../jitterentropy-library.hash                |  4 +--
 .../jitterentropy-library.mk                  |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)
package/jitterentropy-library/0001-Makefile-cleanup-install.patch +13 -14
index 7d209008c9..9c7e40369a 100644
@@ -1,24 +1,26 @@
-From 83b1d46ae48eed576cf3dff0ffd7e772c8e638e4 Mon Sep 17 00:00:00 2001
+From 060b9b4147f6e5ff386a8b017796118d783e59fa Mon Sep 17 00:00:00 2001
 From: Matt Weber <[email protected]>
-Date: Mon, 9 Sep 2019 20:42:14 -0500
-Subject: [PATCH] Makefile: cleanup install
+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 forced man archive creation.
+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: https://github.com/smuellerDD/jitterentropy-library/pull/10
-
 Signed-off-by: Matthew Weber <[email protected]>
+Signed-off-by: Stephan Mueller <[email protected]>
+[Retrieved from:
+https://github.com/smuellerDD/jitterentropy-library/commit/060b9b4147f6e5ff386a8b017796118d783e59fa]
+Signed-off-by: Fabrice Fontaine <[email protected]>
 ---
- Makefile | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
+ Makefile | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 5e31276..a575f32 100644
+index 4ff069b..2e78607 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -14,6 +14,8 @@ LIBDIR := lib
@@ -30,7 +32,7 @@ index 5e31276..a575f32 100644
  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}')
-@@ -49,14 +51,15 @@ scan:      $(OBJS)
+@@ -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/
@@ -39,7 +41,7 @@ index 5e31276..a575f32 100644
        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 -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)
@@ -50,6 +52,3 @@ index 5e31276..a575f32 100644
 
  clean:
        @- $(RM) $(NAME)
---
-2.17.1
-
package/jitterentropy-library/jitterentropy-library.hash +2 -2
index 5846f2147d..5ff38f6fea 100644
@@ -1,5 +1,5 @@
 # Locally computed
-sha256 38519115c6b750b7fa15547826123a7821b271535c168823259e609b42847223  jitterentropy-library-2.1.2.tar.gz
-sha256 c3352794eff829a3c8097b77e4cbc9f1faf5c3f47a8abed960a0f411cbc6ab9f  COPYING
+sha256 42d4bd1050b5f0d7b45b5453e5b6cfc45c0492bb428791f571d8f69b066351a4  jitterentropy-library-2.2.0.tar.gz
+sha256 96b5a6b49aaeeba9036f9b80e6e299d613a8eca158741a25a67dc78792413e23  COPYING
 sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239  COPYING.bsd
 sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4  COPYING.gplv2
package/jitterentropy-library/jitterentropy-library.mk +1 -2
index 4e791e19dd..7ce52aa9ad 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JITTERENTROPY_LIBRARY_VERSION = 2.1.2
+JITTERENTROPY_LIBRARY_VERSION = 2.2.0
 JITTERENTROPY_LIBRARY_SITE = $(call github,smuellerDD,$(JITTERENTROPY_LIBRARY_NAME),v$(JITTERENTROPY_LIBRARY_VERSION))
 JITTERENTROPY_LIBRARY_LICENSE = GPL-2.0 or BSD-3-Clause
 JITTERENTROPY_LIBRARY_LICENSE_FILES = COPYING COPYING.bsd COPYING.gplv2
--
Quoted 2 lines

2.23.0

--

Matthew Weber | Associate Director Software Engineer | Commercial Avionics

COLLINS AEROSPACE

400 Collins Road NE, Cedar Rapids, Iowa 52498, USA

Tel: +1 319 295 7349 | FAX: +1 319 263 6099

matthew.weber at collins.com | collinsaerospace.com

CONFIDENTIALITY WARNING: This message may contain proprietary and/or privileged information of Collins Aerospace and its affiliated companies. If you are not the intended recipient, please 1) Do not disclose, copy, distribute or use this message or its contents. 2) Advise the sender by return email. 3) Delete all copies (including all attachments) from your computer. Your cooperation is greatly appreciated.

Any export restricted material should be shared using my matthew.weber at corp.rockwellcollins.com address.

#6 lore raw

PATCH 1/2 package/jitterentropy-library: bump to version 2.2.0

In reply to Fabrice Fontaine
Quoted 10 lines · On Thu, 24 Oct 2019 18:59:12 +0200 Fabrice Fontaine…

- Refresh patch
- Update hash of COPYING (date updated, see
https://github.com/smuellerDD/jitterentropy-library/commit/ab33ee759ff09a1c9b1184fb2e4614d82c355c2f)

---
 .../0001-Makefile-cleanup-install.patch       | 27 +++++++++----------
 .../jitterentropy-library.hash                |  4 +--
 .../jitterentropy-library.mk                  |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com