* [PATCH 0/1] Fix parallel make for openssl
@ 2011-02-17 8:18 Qing He
2011-02-17 8:18 ` [PATCH 1/1] openssl: fix parallel make Qing He
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Qing He @ 2011-02-17 8:18 UTC (permalink / raw)
To: poky
From: Qing He <qing.he@intel.com>
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix
Thanks,
Qing He <qing.he@intel.com>
---
Qing He (1):
openssl: fix parallel make
.../openssl/openssl-0.9.8p/parallel-make-fix.patch | 18 ++++++++++++++++++
meta/recipes-connectivity/openssl/openssl.inc | 6 +++---
.../recipes-connectivity/openssl/openssl_0.9.8p.bb | 2 +-
3 files changed, 22 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] openssl: fix parallel make
2011-02-17 8:18 [PATCH 0/1] Fix parallel make for openssl Qing He
@ 2011-02-17 8:18 ` Qing He
2011-02-17 18:48 ` Darren Hart
2011-02-17 17:01 ` [PATCH 0/1] Fix parallel make for openssl Tom Rini
2011-02-22 16:22 ` Saul Wold
2 siblings, 1 reply; 6+ messages in thread
From: Qing He @ 2011-02-17 8:18 UTC (permalink / raw)
To: poky
From: Qing He <qing.he@intel.com>
Signed-off-by: Qing He <qing.he@intel.com>
---
.../openssl/openssl-0.9.8p/parallel-make-fix.patch | 18 ++++++++++++++++++
meta/recipes-connectivity/openssl/openssl.inc | 6 +++---
.../recipes-connectivity/openssl/openssl_0.9.8p.bb | 2 +-
3 files changed, 22 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
new file mode 100644
index 0000000..60fab9d
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
@@ -0,0 +1,18 @@
+fix the parallel build regarding shared libraries.
+
+Signed-off-by: Qing He <qing.he@intel.com>
+
+diff --git a/Makefile.org b/Makefile.org
+index 2fb0309..8bec3d0 100644
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -352,6 +352,9 @@ all_testapps: build_libs build_testapps
+ build_testapps:
+ @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
+
++libcrypto.a: build_crypto
++libssl.a: build_ssl
++
+ build_shared: $(SHARED_LIBS)
+ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
+ @if [ "$(SHLIB_TARGET)" != "" ]; then \
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index f054c26..68b3d7b 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=83d26c69f6f0172ee7f795790424b453"
DEPENDS = "perl-native"
-SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
+SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
+ file://parallel-make-fix.patch \
+ "
S = "${WORKDIR}/openssl-${PV}"
AR_append = " r"
@@ -29,8 +31,6 @@ export DIRS = "crypto ssl apps"
export EX_LIBS = "-lgcc -ldl"
export AS = "${CC} -c"
-PARALLEL_MAKE = ""
-
inherit pkgconfig siteinfo
PACKAGES =+ "libcrypto libssl"
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
index 283b82a..f42b3cb 100644
--- a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
+++ b/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
@@ -1,6 +1,6 @@
require openssl.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://debian/ca.patch \
file://debian/config-hurd.patch;apply=no \
file://debian/debian-targets.patch \
--
1.7.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/1] Fix parallel make for openssl
2011-02-17 8:18 [PATCH 0/1] Fix parallel make for openssl Qing He
2011-02-17 8:18 ` [PATCH 1/1] openssl: fix parallel make Qing He
@ 2011-02-17 17:01 ` Tom Rini
2011-02-17 19:44 ` Khem Raj
2011-02-22 16:22 ` Saul Wold
2 siblings, 1 reply; 6+ messages in thread
From: Tom Rini @ 2011-02-17 17:01 UTC (permalink / raw)
To: poky
On 02/17/2011 01:18 AM, Qing He wrote:
> From: Qing He<qing.he@intel.com>
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: qhe/fix
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix
>
> Thanks,
> Qing He<qing.he@intel.com>
> ---
>
>
> Qing He (1):
> openssl: fix parallel make
>
> .../openssl/openssl-0.9.8p/parallel-make-fix.patch | 18 ++++++++++++++++++
> meta/recipes-connectivity/openssl/openssl.inc | 6 +++---
> .../recipes-connectivity/openssl/openssl_0.9.8p.bb | 2 +-
> 3 files changed, 22 insertions(+), 4 deletions(-)
> create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
While in there, shouldn't we update to either 0.9.8r or 1.0.0d, for
security fixes?
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] openssl: fix parallel make
2011-02-17 8:18 ` [PATCH 1/1] openssl: fix parallel make Qing He
@ 2011-02-17 18:48 ` Darren Hart
0 siblings, 0 replies; 6+ messages in thread
From: Darren Hart @ 2011-02-17 18:48 UTC (permalink / raw)
To: Qing He; +Cc: poky
On 02/17/2011 12:18 AM, Qing He wrote:
> From: Qing He<qing.he@intel.com>
I've noticed we have a lot of patches in our sources that have single
line commit logs. It takes a little more time to create an explanatory
message, but it saves everyone who looks at it more time. If understand
this one correctly, it should read something like:
-----
openssl: fix parallel make
The current makefile doesn't explicitly list certain dependencies which
result in a build failure with parallel make.
-----
However, I don't see how the new build_testapps target impacts this.
Thanks,
Darren
>
> Signed-off-by: Qing He<qing.he@intel.com>
> ---
> .../openssl/openssl-0.9.8p/parallel-make-fix.patch | 18 ++++++++++++++++++
> meta/recipes-connectivity/openssl/openssl.inc | 6 +++---
> .../recipes-connectivity/openssl/openssl_0.9.8p.bb | 2 +-
> 3 files changed, 22 insertions(+), 4 deletions(-)
> create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
>
> diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
> new file mode 100644
> index 0000000..60fab9d
> --- /dev/null
> +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
> @@ -0,0 +1,18 @@
> +fix the parallel build regarding shared libraries.
> +
> +Signed-off-by: Qing He<qing.he@intel.com>
> +
> +diff --git a/Makefile.org b/Makefile.org
> +index 2fb0309..8bec3d0 100644
> +--- a/Makefile.org
> ++++ b/Makefile.org
> +@@ -352,6 +352,9 @@ all_testapps: build_libs build_testapps
> + build_testapps:
> + @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
> +
> ++libcrypto.a: build_crypto
> ++libssl.a: build_ssl
> ++
> + build_shared: $(SHARED_LIBS)
> + libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
> + @if [ "$(SHLIB_TARGET)" != "" ]; then \
> diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
> index f054c26..68b3d7b 100644
> --- a/meta/recipes-connectivity/openssl/openssl.inc
> +++ b/meta/recipes-connectivity/openssl/openssl.inc
> @@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=83d26c69f6f0172ee7f795790424b453"
>
> DEPENDS = "perl-native"
>
> -SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
> +SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
> + file://parallel-make-fix.patch \
> + "
> S = "${WORKDIR}/openssl-${PV}"
>
> AR_append = " r"
> @@ -29,8 +31,6 @@ export DIRS = "crypto ssl apps"
> export EX_LIBS = "-lgcc -ldl"
> export AS = "${CC} -c"
>
> -PARALLEL_MAKE = ""
> -
> inherit pkgconfig siteinfo
>
> PACKAGES =+ "libcrypto libssl"
> diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
> index 283b82a..f42b3cb 100644
> --- a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
> +++ b/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
> @@ -1,6 +1,6 @@
> require openssl.inc
>
> -PR = "r2"
> +PR = "r3"
> SRC_URI += "file://debian/ca.patch \
> file://debian/config-hurd.patch;apply=no \
> file://debian/debian-targets.patch \
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/1] Fix parallel make for openssl
2011-02-17 17:01 ` [PATCH 0/1] Fix parallel make for openssl Tom Rini
@ 2011-02-17 19:44 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2011-02-17 19:44 UTC (permalink / raw)
To: Tom Rini; +Cc: poky
On Thu, Feb 17, 2011 at 9:01 AM, Tom Rini <tom_rini@mentor.com> wrote:
> On 02/17/2011 01:18 AM, Qing He wrote:
>>
>> From: Qing He<qing.he@intel.com>
>>
>> Pull URL: git://git.pokylinux.org/poky-contrib.git
>> Branch: qhe/fix
>> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix
>>
>> Thanks,
>> Qing He<qing.he@intel.com>
>> ---
>>
>>
>> Qing He (1):
>> openssl: fix parallel make
>>
>> .../openssl/openssl-0.9.8p/parallel-make-fix.patch | 18
>> ++++++++++++++++++
>> meta/recipes-connectivity/openssl/openssl.inc | 6 +++---
>> .../recipes-connectivity/openssl/openssl_0.9.8p.bb | 2 +-
>> 3 files changed, 22 insertions(+), 4 deletions(-)
>> create mode 100644
>> meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
>
> While in there, shouldn't we update to either 0.9.8r or 1.0.0d, for security
> fixes?
1.0.0 is a big jump and you need a proper upgrade path if that matters
see OE discussions from last year on it.
>
> --
> Tom Rini
> Mentor Graphics Corporation
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/1] Fix parallel make for openssl
2011-02-17 8:18 [PATCH 0/1] Fix parallel make for openssl Qing He
2011-02-17 8:18 ` [PATCH 1/1] openssl: fix parallel make Qing He
2011-02-17 17:01 ` [PATCH 0/1] Fix parallel make for openssl Tom Rini
@ 2011-02-22 16:22 ` Saul Wold
2 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2011-02-22 16:22 UTC (permalink / raw)
To: Qing He; +Cc: poky
On 02/17/2011 12:18 AM, Qing He wrote:
> From: Qing He<qing.he@intel.com>
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: qhe/fix
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix
>
> Thanks,
> Qing He<qing.he@intel.com>
> ---
>
>
> Qing He (1):
> openssl: fix parallel make
>
> .../openssl/openssl-0.9.8p/parallel-make-fix.patch | 18 ++++++++++++++++++
> meta/recipes-connectivity/openssl/openssl.inc | 6 +++---
> .../recipes-connectivity/openssl/openssl_0.9.8p.bb | 2 +-
> 3 files changed, 22 insertions(+), 4 deletions(-)
> create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
Parallel make change merged into Master
Thanks
Sau!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-02-22 16:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-17 8:18 [PATCH 0/1] Fix parallel make for openssl Qing He
2011-02-17 8:18 ` [PATCH 1/1] openssl: fix parallel make Qing He
2011-02-17 18:48 ` Darren Hart
2011-02-17 17:01 ` [PATCH 0/1] Fix parallel make for openssl Tom Rini
2011-02-17 19:44 ` Khem Raj
2011-02-22 16:22 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.