[OE-core] [warrior 3/8] openssl: Fix reproducibility issue
From: Richard Purdie
There was a build architecture leaking into the target ptest which
could vary depending upon host. Remove it as its cosmetic.
[YOCTO #13770]
(From OE-Core rev: 37db519eedb7eb5cd4f14d05f30f5d580aa7458d)
(From OE-Core rev: c31c676319812e6fc036741db2ab8e16eccff723)
Signed-off-by: Richard Purdie
Signed-off-by: Armin Kuster
---
.../openssl/openssl/reproducible.patch| 32 +++
.../openssl/openssl_1.1.1d.bb | 1 +
2 files changed, 33 insertions(+)
create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch
b/meta/recipes-connectivity/openssl/openssl/reproducible.patch
new file mode 100644
index 00..a24260c95d
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch
@@ -0,0 +1,32 @@
+The value for perl_archname can vary depending on the host, e.g.
+x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which
+makes the ptest package non-reproducible. Its unused other than
+these references so drop it.
+
+RP 2020/2/6
+
+Upstream-Status: Pending
+Signed-off-by: Richard Purdie
+
+Index: openssl-1.1.1d/Configure
+===
+--- openssl-1.1.1d.orig/Configure
openssl-1.1.1d/Configure
+@@ -286,7 +286,7 @@ if (defined env($local_config_envname))
+ # Save away perl command information
+ $config{perl_cmd} = $^X;
+ $config{perl_version} = $Config{version};
+-$config{perl_archname} = $Config{archname};
++#$config{perl_archname} = $Config{archname};
+
+ $config{prefix}="";
+ $config{openssldir}="";
+@@ -2517,7 +2517,7 @@ _
+ @{$config{perlargv}}), "\n";
+ print "\nPerl information:\n\n";
+ print '',$config{perl_cmd},"\n";
+-print '',$config{perl_version},' for
',$config{perl_archname},"\n";
++print '',$config{perl_version},"\n";
+ }
+ if ($dump || $options) {
+ my $longest = 0;
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
index d256646934..67eea6592e 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
@@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz
\
file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
file://afalg.patch \
file://CVE-2019-1551.patch \
+ file://reproducible.patch \
"
SRC_URI_append_class-nativesdk = " \
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138592):
https://lists.openembedded.org/g/openembedded-core/message/138592
Mute This Topic: https://lists.openembedded.org/mt/74400101/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [warrior 3/8] openssl: Fix reproducibility issue
From: Richard Purdie
There was a build architecture leaking into the target ptest which
could vary depending upon host. Remove it as its cosmetic.
[YOCTO #13770]
(From OE-Core rev: 37db519eedb7eb5cd4f14d05f30f5d580aa7458d)
(From OE-Core rev: c31c676319812e6fc036741db2ab8e16eccff723)
Signed-off-by: Richard Purdie
Signed-off-by: Armin Kuster
---
.../openssl/openssl/reproducible.patch| 32 +++
.../openssl/openssl_1.1.1d.bb | 1 +
2 files changed, 33 insertions(+)
create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch
b/meta/recipes-connectivity/openssl/openssl/reproducible.patch
new file mode 100644
index 00..a24260c95d
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch
@@ -0,0 +1,32 @@
+The value for perl_archname can vary depending on the host, e.g.
+x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which
+makes the ptest package non-reproducible. Its unused other than
+these references so drop it.
+
+RP 2020/2/6
+
+Upstream-Status: Pending
+Signed-off-by: Richard Purdie
+
+Index: openssl-1.1.1d/Configure
+===
+--- openssl-1.1.1d.orig/Configure
openssl-1.1.1d/Configure
+@@ -286,7 +286,7 @@ if (defined env($local_config_envname))
+ # Save away perl command information
+ $config{perl_cmd} = $^X;
+ $config{perl_version} = $Config{version};
+-$config{perl_archname} = $Config{archname};
++#$config{perl_archname} = $Config{archname};
+
+ $config{prefix}="";
+ $config{openssldir}="";
+@@ -2517,7 +2517,7 @@ _
+ @{$config{perlargv}}), "\n";
+ print "\nPerl information:\n\n";
+ print '',$config{perl_cmd},"\n";
+-print '',$config{perl_version},' for
',$config{perl_archname},"\n";
++print '',$config{perl_version},"\n";
+ }
+ if ($dump || $options) {
+ my $longest = 0;
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
index d256646934..67eea6592e 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
@@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz
\
file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
file://afalg.patch \
file://CVE-2019-1551.patch \
+ file://reproducible.patch \
"
SRC_URI_append_class-nativesdk = " \
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138468):
https://lists.openembedded.org/g/openembedded-core/message/138468
Mute This Topic: https://lists.openembedded.org/mt/74326633/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
