openssl parallel build
cover openssl parallel build
All,
I have adopted Thomas P's patches that we submitted but in May in order enable parallel build of openssl. I have updated the patches to use the latest patches available from gentoo and have tested builds only on i386, ARM, and MIPS.
Original Patches:
http://patchwork.ozlabs.org/patch/473086/
http://patchwork.ozlabs.org/patch/473087/
Thanks,
-Ryan
Thomas Petazzoni (2):
openssl: use git formatted patches
openssl: enable parallel build and installation
...time-building-manpages-if-we-re-not-going.patch | 28 +++++++++
...odev-Fix-issue-with-signature-generation.patch} | 71 +++++++++++++---------
package/openssl/001-do-not-build-docs.patch | 13 ----
package/openssl/openssl.hash | 2 +
package/openssl/openssl.mk | 12 ++--
5 files changed, 79 insertions(+), 47 deletions(-)
create mode 100644 package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
rename package/openssl/{003-cryptodev-Fix-issue-with-signature-generation.patch => 0002-cryptodev-Fix-issue-with-signature-generation.patch} (82%)
delete mode 100644 package/openssl/001-do-not-build-docs.patchSignature · 1 line
1.9.1
PATCH 1/2 openssl: use git formatted patches
From: Thomas Petazzoni <[email protected]>
Using Git formatted patches makes it easier to adjust the patches when needed.
[Ryan: removed unnecessary patch and updated offsets]
---
...time-building-manpages-if-we-re-not-going.patch | 27 +++++++++
...odev-Fix-issue-with-signature-generation.patch} | 70 +++++++++++++---------
package/openssl/001-do-not-build-docs.patch | 13 ----
3 files changed, 68 insertions(+), 42 deletions(-)
create mode 100644 package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
rename package/openssl/{003-cryptodev-Fix-issue-with-signature-generation.patch => 0002-cryptodev-Fix-issue-with-signature-generation.patch} (82%)
delete mode 100644 package/openssl/001-do-not-build-docs.patchpackage/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 53980448064b362a58e4ab2aca6f38fec93c07c3 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +Date: Sat, 16 May 2015 18:53:51 +0200 +Subject: [PATCH 1/3] Dont waste time building manpages if we're not going to + use em. + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + Makefile.org | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.org b/Makefile.org +index b7a3f96..8a47840 100644 +--- a/Makefile.org ++++ b/Makefile.org +@@ -536,7 +536,7 @@ dist: + dist_pem_h: + (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) + +-install: all install_docs install_sw ++install: all install_sw + + install_sw: + @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ +-- +2.1.0 +
package/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch renamed from package/openssl/003-cryptodev-Fix-issue-with-signature-generation.patch +41 -29
233 lines not on this page · raw message
package/openssl/001-do-not-build-docs.patch deleted +0 -13
@@ -1,13 +0,0 @@ -Dont waste time building manpages if we're not going to use em. - ---- openssl/Makefile.org -+++ openssl/Makefile.org -@@ -792,7 +792,7 @@ - dist_pem_h: - (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) - --install: all install_docs install_sw -+install: all install_sw - - install_sw: - @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
Signature · 1 line
1.9.1
PATCH 1/2 openssl: use git formatted patches
Quoted 24 lines · Ryan Barnett
From: Thomas Petazzoni <[email protected]>
Using Git formatted patches makes it easier to adjust the patches when needed.
[Ryan: removed unnecessary patch and updated offsets]
Signed-off-by Thomas Petazzoni <[email protected]>Signed-off-by Ryan Barnett <[email protected]>--- ...time-building-manpages-if-we-re-not-going.patch | 27 +++++++++ ...odev-Fix-issue-with-signature-generation.patch} | 70 +++++++++++++--------- package/openssl/001-do-not-build-docs.patch | 13 ---- 3 files changed, 68 insertions(+), 42 deletions(-) create mode 100644 package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch rename package/openssl/{003-cryptodev-Fix-issue-with-signature-generation.patch => 0002-cryptodev-Fix-issue-with-signature-generation.patch} (82%) delete mode 100644 package/openssl/001-do-not-build-docs.patchpackage/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch new file +0
-0
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch line 4
Quoted 4 lines
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch new file +4
-0@@ -0,0 +1,27 @@ +From 53980448064b362a58e4ab2aca6f38fec93c07c3 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +Date: Sat, 16 May 2015 18:53:51 +0200 +Subject: [PATCH 1/3] Dont waste time building manpages if we're not going to
^^^^^^^^^^
Please generate patches with -N to avoid the 1/3: it's incorrect (there are
only 2 patches) and it causes additional churn when patches are regenerated.
I also like to add --subject-prefix= to remove the [PATCH] part, which is not
at all useful in this context. But others may disagree.
Quoted 7 lines
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch new file +7
-0+ use em. + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + Makefile.org | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +
[snip]
package/openssl/001-do-not-build-docs.patch
Quoted 1 line
package/openssl/001-do-not-build-docs.patch +0
-0
If you resend, perhaps you can add -M20% so the rename is detected?
Regards,
Arnout
Quoted 19 lines
deleted file mode 100644
index 135a9d3..0000000package/openssl/001-do-not-build-docs.patch deleted +0
-13@@ -1,13 +0,0 @@ -Dont waste time building manpages if we're not going to use em. - ---- openssl/Makefile.org -+++ openssl/Makefile.org -@@ -792,7 +792,7 @@ - dist_pem_h: - (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) - --install: all install_docs install_sw -+install: all install_sw - - install_sw: - @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 1/2 openssl: use git formatted patches
Arnout,
Quoted 30 lines · Arnout Vandecappelle
Quoted 24 lines · Ryan Barnett
From: Thomas Petazzoni <[email protected]>
Using Git formatted patches makes it easier to adjust the patches when needed.
[Ryan: removed unnecessary patch and updated offsets]
Signed-off-by Thomas Petazzoni <[email protected]>Signed-off-by Ryan Barnett <[email protected]>--- ...time-building-manpages-if-we-re-not-going.patch | 27 +++++++++ ...odev-Fix-issue-with-signature-generation.patch} | 70 +++++++++++++--------- package/openssl/001-do-not-build-docs.patch | 13 ---- 3 files changed, 68 insertions(+), 42 deletions(-) create mode 100644 package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch rename package/openssl/{003-cryptodev-Fix-issue-with-signature-generation.patch => 0002-cryptodev-Fix-issue-with-signature-generation.patch} (82%) delete mode 100644 package/openssl/001-do-not-build-docs.patchpackage/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch new file +0
-0package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch line 4
Quoted 4 lines
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch new file +4
-0@@ -0,0 +1,27 @@ +From 53980448064b362a58e4ab2aca6f38fec93c07c3 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +Date: Sat, 16 May 2015 18:53:51 +0200 +Subject: [PATCH 1/3] Dont waste time building manpages if we're not going to^^^^^^^^^^
Quoted 2 lines
Please generate patches with -N to avoid the 1/3: it's incorrect (there are
only 2 patches) and it causes additional churn when patches are regenerated.
When I was adopting these patches, I was lazy and didn't make any changes from Thomas's last patch other than just dropping the unnecessary third patch.
Quoted 2 lines
I also like to add --subject-prefix= to remove the [PATCH] part, which is not
at all useful in this context. But others may disagree.
I agree with this.
Do we want to update our buildroot documentation to reflect this?
Secondly, do you think it would be useful to add a new subsection that documents how to properly use git to generate patches for use within buildroot?
http://nightly.buildroot.org/manual.html#patch-policy
Quoted 11 lines
Quoted 7 lines
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch new file +7
-0+ use em. + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + Makefile.org | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +[snip]
package/openssl/001-do-not-build-docs.patch
Quoted 1 line
package/openssl/001-do-not-build-docs.patch +0
-0If you resend, perhaps you can add -M20% so the rename is detected?
Sure. Might just stick with '-M'.
Is 20% similarity more acceptable amount than just -M (by default it is 50%)? In our buildroot documentation we list just using -M when sending patches upstream.
Thanks,
-Ryan
PATCH 1/2 openssl: use git formatted patches
Quoted 45 lines · Ryan Barnett
Arnout,
Quoted 30 lines · Arnout Vandecappelle
Quoted 24 lines · Ryan Barnett
From: Thomas Petazzoni <[email protected]>
Using Git formatted patches makes it easier to adjust the patches when needed.
[Ryan: removed unnecessary patch and updated offsets]
Signed-off-by Thomas Petazzoni <[email protected]>Signed-off-by Ryan Barnett <[email protected]>--- ...time-building-manpages-if-we-re-not-going.patch | 27 +++++++++ ...odev-Fix-issue-with-signature-generation.patch} | 70 +++++++++++++--------- package/openssl/001-do-not-build-docs.patch | 13 ---- 3 files changed, 68 insertions(+), 42 deletions(-) create mode 100644 package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch rename package/openssl/{003-cryptodev-Fix-issue-with-signature-generation.patch => 0002-cryptodev-Fix-issue-with-signature-generation.patch} (82%) delete mode 100644 package/openssl/001-do-not-build-docs.patchpackage/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch new file +0
-0package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch line 4
Quoted 4 lines
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch new file +4
-0@@ -0,0 +1,27 @@ +From 53980448064b362a58e4ab2aca6f38fec93c07c3 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +Date: Sat, 16 May 2015 18:53:51 +0200 +Subject: [PATCH 1/3] Dont waste time building manpages if we're not going to^^^^^^^^^^Quoted 2 lines
Please generate patches with -N to avoid the 1/3: it's incorrect (there are
only 2 patches) and it causes additional churn when patches are regenerated.When I was adopting these patches, I was lazy and didn't make any changes from Thomas's last patch other than just dropping the unnecessary third patch.
Quoted 2 lines
I also like to add --subject-prefix= to remove the [PATCH] part, which is not
at all useful in this context. But others may disagree.I agree with this.
Quoted 7 lines
Do we want to update our buildroot documentation to reflect this?
Secondly, do you think it would be useful to add a new subsection that documents how to properly use git to generate patches for use within buildroot?
Both suggestions sound really nice!
Quoted 13 lines
Quoted 9 lines
Quoted 8 lines
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch new file +7
-0+ use em. + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + Makefile.org | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +[snip]
Quoted 3 lines
package/openssl/001-do-not-build-docs.patch
Quoted 1 line
package/openssl/001-do-not-build-docs.patch +0
-0If you resend, perhaps you can add -M20% so the rename is detected?
Quoted 5 lines
Sure. Might just stick with '-M'.
Is 20% similarity more acceptable amount than just -M (by default it is 50%)? In our buildroot documentation we list just using -M when sending patches upstream.
I thought you already did use -M, otherwise the other patch wouldn't have been
detected as a rename. The default -M50% is normally good enough - if more than half the lines change, it's probably not a reall rename. Only in this case, the file was pretty small to begin with and all the git headers double its size, so -M50% won't hit it. So if you see that in your format-patch output you can decide to go for a smaller -M.
Obviously, it makes no difference for what gets committed in the end. It just
looks nicer for the reviewers.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout dot vandecappelle at essensium dot com Senior Embedded Software Architect . . . . . . +32-478-010353 (mobile) Essensium, Mind division . . . . . . . . . . . . . . http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium . . . . . BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 2/2 openssl: enable parallel build and installation
In reply to Ryan BarnettFrom: Thomas Petazzoni <[email protected]>
On my build server, the current build of OpenSSL takes 1 minutes and 20 seconds. With this commit applied, enabling parallel build and installation, the build only takes 28 seconds.
All the patches are downloaded from Gentoo.
There is apparently some interest in upstream OpenSSL to enable
parallel build, see for example commit
https://github.com/openssl/openssl/commit/c3f22253b139793ff3b91ff7e6969e180cf06815. This commit is not part of any OpenSSL release, but we can hope that the problem will resolved in the future.
I have tested 20 consecutive builds of a config that has openssl and host-openssl being used by uboot-tools and host-uboot-tools (through the FIT image support).
[Ryan: simplified patches from gentoo (single patch now)] [Ryan: updated offsets to apply cleanly]
[Ryan: updated hash file]
--- ...ont-waste-time-building-manpages-if-we-re-not-going.patch | 11 ++++++----- .../0002-cryptodev-Fix-issue-with-signature-generation.patch | 7 ++++--- package/openssl/openssl.hash | 2 ++ package/openssl/openssl.mk | 12 +++++++----- 4 files changed, 19 insertions(+), 13 deletions(-)
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +6 -5
@@ -1,19 +1,20 @@ -From 53980448064b362a58e4ab2aca6f38fec93c07c3 Mon Sep 17 00:00:00 2001 +From 12de3d3aa9525c551ebbd7fcff9d9d2b08e58aad Mon Sep 17 00:00:00 2001 From: Mike Frysinger <[email protected]> Date: Sat, 16 May 2015 18:53:51 +0200 -Subject: [PATCH 1/3] Dont waste time building manpages if we're not going to +Subject: [PATCH 1/2] Dont waste time building manpages if we're not going to use em. Signed-off-by: Thomas Petazzoni <[email protected]> +Signed-off-by: Ryan Barnett <[email protected]> --- Makefile.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.org b/Makefile.org -index b7a3f96..8a47840 100644 +index 60f07cc..976ceaf 100644 --- a/Makefile.org +++ b/Makefile.org -@@ -536,7 +536,7 @@ dist: +@@ -527,7 +527,7 @@ dist: dist_pem_h: (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
@@ -23,5 +24,5 @@ index b7a3f96..8a47840 100644 install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ -- -2.1.0 +1.9.1
package/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch +4 -3
@@ -1,7 +1,7 @@ -From 0718df24bd828f26d7d0e8e7f935d8e21f70ebca Mon Sep 17 00:00:00 2001 +From 4f802320219bc5c4969ce92ba42acce73bad0b77 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias <[email protected]> Date: Sat, 16 May 2015 18:55:08 +0200 -Subject: [PATCH 2/3] cryptodev: Fix issue with signature generation +Subject: [PATCH 2/2] cryptodev: Fix issue with signature generation Forward port of 0001-cryptodev-Fix-issue-with-signature-generation.patch from http://rt.openssl.org/Ticket/Display.html?id=2770&user=guest&pass=guest
@@ -10,6 +10,7 @@ It was originally targetted at 1.0.2-beta3. Without this patch digest acceleration via cryptodev is broken. Signed-off-by: Thomas Petazzoni <[email protected]> +Signed-off-by: Ryan Barnett <[email protected]> --- crypto/engine/eng_cryptodev.c | 195 +++++++++++++++++++++++++++++++----------- 1 file changed, 146 insertions(+), 49 deletions(-)
@@ -445,5 +446,5 @@ index 926d95c..7021d9a 100644 !ENGINE_set_digests(engine, cryptodev_engine_digests) || !ENGINE_set_ctrl_function(engine, cryptodev_ctrl) || -- -2.1.0 +1.9.1
package/openssl/openssl.hash +2 -0
@@ -1,2 +1,4 @@ # From https://www.openssl.org/source/openssl-1.0.2d.tar.gz.sha256 sha256 671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8 openssl-1.0.2d.tar.gz +# Locally computed +sha256 deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f openssl-1.0.2d-parallel-build.patch?revision=1.1
package/openssl/openssl.mk +7 -5
@@ -13,6 +13,8 @@ OPENSSL_DEPENDENCIES = zlib HOST_OPENSSL_DEPENDENCIES = host-zlib OPENSSL_TARGET_ARCH = generic32 OPENSSL_CFLAGS = $(TARGET_CFLAGS) +OPENSSL_PATCH = \ + https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch?revision=1.1 ifeq ($(BR2_USE_MMU),) OPENSSL_CFLAGS += -DHAVE_FORK=0
@@ -99,23 +101,23 @@ OPENSSL_POST_CONFIGURE_HOOKS += OPENSSL_FIXUP_STATIC_MAKEFILE endif define HOST_OPENSSL_BUILD_CMDS - $(MAKE1) -C $(@D) + $(MAKE) -C $(@D) endef define OPENSSL_BUILD_CMDS - $(MAKE1) -C $(@D) + $(MAKE) -C $(@D) endef define OPENSSL_INSTALL_STAGING_CMDS - $(MAKE1) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install + $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install endef define HOST_OPENSSL_INSTALL_CMDS - $(MAKE1) -C $(@D) install + $(MAKE) -C $(@D) install endef define OPENSSL_INSTALL_TARGET_CMDS - $(MAKE1) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install + $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install rm -rf $(TARGET_DIR)/usr/lib/ssl rm -f $(TARGET_DIR)/usr/bin/c_rehash endef
Signature · 1 line
1.9.1
PATCH 2/2 openssl: enable parallel build and installation
package/openssl/openssl.mk OPENSSL_DEPENDENCIES = zlib · line 17
Quoted 2 lines · Ryan Barnett
package/openssl/openssl.mk +2
-0+OPENSSL_PATCH = \ + https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch?revision=1.1
Gentoo has moved to git now, so fetching from cvs will yield stale results
(not that i think the patches have been updated since the move ...)
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150915/249fa0fd/attachment.asc>
PATCH 2/2 openssl: enable parallel build and installation
In reply to Ryan BarnettQuoted 36 lines · Ryan Barnett
From: Thomas Petazzoni <[email protected]>
On my build server, the current build of OpenSSL takes 1 minutes and 20 seconds. With this commit applied, enabling parallel build and installation, the build only takes 28 seconds.
All the patches are downloaded from Gentoo.
There is apparently some interest in upstream OpenSSL to enable
parallel build, see for example commit
https://github.com/openssl/openssl/commit/c3f22253b139793ff3b91ff7e6969e180cf06815. This commit is not part of any OpenSSL release, but we can hope that the problem will resolved in the future.I have tested 20 consecutive builds of a config that has openssl and host-openssl being used by uboot-tools and host-uboot-tools (through the FIT image support).
[Ryan: simplified patches from gentoo (single patch now)] [Ryan: updated offsets to apply cleanly]
[Ryan: updated hash file]Signed-off-by Thomas Petazzoni <[email protected]>Signed-off-by Ryan Barnett <[email protected]>--- ...ont-waste-time-building-manpages-if-we-re-not-going.patch | 11 ++++++----- .../0002-cryptodev-Fix-issue-with-signature-generation.patch | 7 ++++--- package/openssl/openssl.hash | 2 ++ package/openssl/openssl.mk | 12 +++++++----- 4 files changed, 19 insertions(+), 13 deletions(-)package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +0
-0
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch line 8
Quoted 10 lines
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +3
-2@@ -1,19 +1,20 @@ -From 53980448064b362a58e4ab2aca6f38fec93c07c3 Mon Sep 17 00:00:00 2001 +From 12de3d3aa9525c551ebbd7fcff9d9d2b08e58aad Mon Sep 17 00:00:00 2001 From: Mike Frysinger <[email protected]> Date: Sat, 16 May 2015 18:53:51 +0200 -Subject: [PATCH 1/3] Dont waste time building manpages if we're not going to +Subject: [PATCH 1/2] Dont waste time building manpages if we're not going to use em. Signed-off-by: Thomas Petazzoni <[email protected]> +Signed-off-by: Ryan Barnett <[email protected]>
You should probably have added your Sob in the first patch already. This is
just useless churn.
Quoted 36 lines
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +3
-3--- Makefile.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.org b/Makefile.org -index b7a3f96..8a47840 100644 +index 60f07cc..976ceaf 100644 --- a/Makefile.org +++ b/Makefile.org -@@ -536,7 +536,7 @@ dist: +@@ -527,7 +527,7 @@ dist: dist_pem_h: (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)@@ -23,5 +24,5 @@ index b7a3f96..8a47840 100644 install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ -- -2.1.0 +1.9.1package/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch +2
-2@@ -1,7 +1,7 @@ -From 0718df24bd828f26d7d0e8e7f935d8e21f70ebca Mon Sep 17 00:00:00 2001 +From 4f802320219bc5c4969ce92ba42acce73bad0b77 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias <[email protected]> Date: Sat, 16 May 2015 18:55:08 +0200 -Subject: [PATCH 2/3] cryptodev: Fix issue with signature generation +Subject: [PATCH 2/2] cryptodev: Fix issue with signature generation Forward port of 0001-cryptodev-Fix-issue-with-signature-generation.patch from http://rt.openssl.org/Ticket/Display.html?id=2770&user=guest&pass=guest
package/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch It was originally targetted at 1.0.2-beta3. · line 13
Quoted 4 lines
package/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch +1
-0@@ -10,6 +10,7 @@ It was originally targetted at 1.0.2-beta3. Without this patch digest acceleration via cryptodev is broken. Signed-off-by: Thomas Petazzoni <[email protected]> +Signed-off-by: Ryan Barnett <[email protected]>
Same here.
Quoted 24 lines
package/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch +1
-1--- crypto/engine/eng_cryptodev.c | 195 +++++++++++++++++++++++++++++++----------- 1 file changed, 146 insertions(+), 49 deletions(-)@@ -445,5 +446,5 @@ index 926d95c..7021d9a 100644 !ENGINE_set_digests(engine, cryptodev_engine_digests) || !ENGINE_set_ctrl_function(engine, cryptodev_ctrl) || -- -2.1.0 +1.9.1package/openssl/openssl.hash +2
-0@@ -1,2 +1,4 @@ # From https://www.openssl.org/source/openssl-1.0.2d.tar.gz.sha256 sha256 671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8 openssl-1.0.2d.tar.gz +# Locally computed +sha256 deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f openssl-1.0.2d-parallel-build.patch?revision=1.1package/openssl/openssl.mk +0
-0
package/openssl/openssl.mk OPENSSL_DEPENDENCIES = zlib · line 18
Quoted 6 lines
package/openssl/openssl.mk +2
-0@@ -13,6 +13,8 @@ OPENSSL_DEPENDENCIES = zlib HOST_OPENSSL_DEPENDENCIES = host-zlib OPENSSL_TARGET_ARCH = generic32 OPENSSL_CFLAGS = $(TARGET_CFLAGS) +OPENSSL_PATCH = \ + https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch?revision=1.1
Is there a non-https URL available by any chance?
Regards,
Arnout
Quoted 32 lines
package/openssl/openssl.mk +5
-5ifeq ($(BR2_USE_MMU),) OPENSSL_CFLAGS += -DHAVE_FORK=0@@ -99,23 +101,23 @@ OPENSSL_POST_CONFIGURE_HOOKS += OPENSSL_FIXUP_STATIC_MAKEFILE endif define HOST_OPENSSL_BUILD_CMDS - $(MAKE1) -C $(@D) + $(MAKE) -C $(@D) endef define OPENSSL_BUILD_CMDS - $(MAKE1) -C $(@D) + $(MAKE) -C $(@D) endef define OPENSSL_INSTALL_STAGING_CMDS - $(MAKE1) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install + $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install endef define HOST_OPENSSL_INSTALL_CMDS - $(MAKE1) -C $(@D) install + $(MAKE) -C $(@D) install endef define OPENSSL_INSTALL_TARGET_CMDS - $(MAKE1) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install + $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install rm -rf $(TARGET_DIR)/usr/lib/ssl rm -f $(TARGET_DIR)/usr/bin/c_rehash endef
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 2/2 openssl: enable parallel build and installation
Hi Arnout,
Quoted 15 lines · Arnout Vandecappelle
Quoted 13 lines · Ryan Barnett
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +2
-2@@ -1,19 +1,20 @@ -From 53980448064b362a58e4ab2aca6f38fec93c07c3 Mon Sep 17 00:00:00 2001 +From 12de3d3aa9525c551ebbd7fcff9d9d2b08e58aad Mon Sep 17 00:00:00 2001 From: Mike Frysinger <[email protected]> Date: Sat, 16 May 2015 18:53:51 +0200 -Subject: [PATCH 1/3] Dont waste time building manpages if we're not going to +Subject: [PATCH 1/2] Dont waste time building manpages if we're not going to use em.
Quoted 5 lines
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch line 8
Quoted 2 lines
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +1
-0Signed-off-by: Thomas Petazzoni <[email protected]> +Signed-off-by: Ryan Barnett <[email protected]>You should probably have added your Sob in the first patch already. This is
just useless churn.
Agreed. Will respin with this fixed.
Quoted 14 lines
Quoted 14 lines
package/openssl/openssl.hash +2
-0@@ -1,2 +1,4 @@ # From https://www.openssl.org/source/openssl-1.0.2d.tar.gz.sha256 sha256 671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8 openssl-1.0.2d.tar.gz +# Locally computed +sha256 deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f openssl-1.0.2d-parallel-build.patch?revision=1.1package/openssl/openssl.mk +0
-0@@ -13,6 +13,8 @@ OPENSSL_DEPENDENCIES = zlib
Quoted 8 lines
package/openssl/openssl.mk OPENSSL_DEPENDENCIES = zlib · line 18
Quoted 6 lines
package/openssl/openssl.mk +2
-0HOST_OPENSSL_DEPENDENCIES = host-zlib OPENSSL_TARGET_ARCH = generic32 OPENSSL_CFLAGS = $(TARGET_CFLAGS) +OPENSSL_PATCH = \ + https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch?revision=1.1Is there a non-https URL available by any chance?
I will be updating to utilize the latest patch available from Gentoo's git repo as pointed out by Mike Frysinger. It doesn't appear that gentoo's website is accessible from a non-https connection. The updated path will be:
For more information on non-https site, I tired http:// request of the url and am redirected to https:// address:
~$ wget http://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch
Proxy request sent, awaiting response... 301 Moved Permanently
Location: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch
[following]
--2015-09-15 14:26:15--
https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch
Proxy request sent, awaiting response... 200 OK
Length: 9504 (9.3K) [text/x-diff]
Saving to: ?openssl-1.0.2d-parallel-build.patch?
100%[===================================================================================================================================================================>]
9,504 --.-K/s in 0s
2015-09-15 14:26:16 (65.6 MB/s) -
?openssl-1.0.2d-parallel-build.patch? saved [9504/9504]
I will respin with your suggestions later tonight.
Thanks,
-Ryan