* [meta-oe][PATCH v2] nss: Upgrade to 3.56
@ 2020-08-28 2:04 Khem Raj
2020-08-28 14:43 ` [oe] " akuster
0 siblings, 1 reply; 7+ messages in thread
From: Khem Raj @ 2020-08-28 2:04 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj
Forward port 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v2: Update armv8 hw crypto patch to work on arm32
...figure-option-to-disable-ARM-HW-cryp.patch | 32 ++++++-------------
.../nss/{nss_3.54.bb => nss_3.56.bb} | 3 +-
2 files changed, 11 insertions(+), 24 deletions(-)
rename meta-oe/recipes-support/nss/{nss_3.54.bb => nss_3.56.bb} (99%)
diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
index 1a87a0577f..f1f76bd1b7 100644
--- a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
+++ b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
@@ -14,21 +14,18 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
nss/lib/freebl/gcm.c | 2 ++
2 files changed, 6 insertions(+)
-diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index f99f769..b0ec81b 100644
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
-@@ -125,6 +125,9 @@ else
- DEFINES += -DNSS_X86
+@@ -126,6 +126,8 @@ else
endif
endif
-+
+ ifdef NS_USE_GCC
+ifdef NSS_USE_ARM_HW_CRYPTO
+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO
ifeq ($(CPU_ARCH),aarch64)
- DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
- EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
-@@ -148,6 +151,7 @@ endif
+ DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
+ EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c
+@@ -150,6 +152,7 @@ endif
endif
endif
endif
@@ -36,23 +33,14 @@ index f99f769..b0ec81b 100644
ifeq ($(OS_TARGET),OSF1)
DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
-diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
-index c2cc18d..b77f573 100644
--- a/nss/lib/freebl/gcm.c
+++ b/nss/lib/freebl/gcm.c
-@@ -18,6 +18,7 @@
+@@ -20,7 +20,7 @@
- #include <limits.h>
-
-+#ifdef NSS_USE_ARM_HW_CRYPTO
/* old gcc doesn't support some poly64x2_t intrinsic */
#if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
- (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
-@@ -27,6 +28,7 @@
- /* We don't test on big endian platform, so disable this on big endian. */
+- (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
++ (defined(__clang__) && defined(NSS_USE_ARM_HW_CRYPTO) || defined(__GNUC__) && __GNUC__ > 6)
#define USE_ARM_GCM
- #endif
-+#endif
-
- /* Forward declarations */
- SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
+ #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
+ !defined(NSS_DISABLE_ARM32_NEON)
diff --git a/meta-oe/recipes-support/nss/nss_3.54.bb b/meta-oe/recipes-support/nss/nss_3.56.bb
similarity index 99%
rename from meta-oe/recipes-support/nss/nss_3.54.bb
rename to meta-oe/recipes-support/nss/nss_3.56.bb
index 1cc94735bb..4aa5d29ec2 100644
--- a/meta-oe/recipes-support/nss/nss_3.54.bb
+++ b/meta-oe/recipes-support/nss/nss_3.56.bb
@@ -34,8 +34,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \
"
-
-SRC_URI[sha256sum] = "dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43"
+SRC_URI[sha256sum] = "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c"
UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH v2] nss: Upgrade to 3.56
2020-08-28 2:04 [meta-oe][PATCH v2] nss: Upgrade to 3.56 Khem Raj
@ 2020-08-28 14:43 ` akuster
2020-08-28 15:14 ` Martin Jansa
0 siblings, 1 reply; 7+ messages in thread
From: akuster @ 2020-08-28 14:43 UTC (permalink / raw)
To: Khem Raj, openembedded-devel
On 8/27/20 7:04 PM, Khem Raj wrote:
> Forward port 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> v2: Update armv8 hw crypto patch to work on arm32
Did you add this to an image?
I am seeing new error when nss is appended to an image.
WARNING: security-build-image-1.0-r0 do_rootfs: nss.postinst returned 127, marking as unpacked only, configuration required on target.
2020-08-28 02:07:33 - ERROR - ERROR: security-build-image-1.0-r0 do_rootfs: Postinstall scriptlets of ['nss'] have failed. If the intention is to defer them to first boot,
2020-08-28 02:07:33 - ERROR - then please place them into pkg_postinst_ontarget_${PN} ().
2020-08-28 02:07:33 - ERROR - Deferring to first boot via 'exit 1' is no longer supported.
- Armin
>
> ...figure-option-to-disable-ARM-HW-cryp.patch | 32 ++++++-------------
> .../nss/{nss_3.54.bb => nss_3.56.bb} | 3 +-
> 2 files changed, 11 insertions(+), 24 deletions(-)
> rename meta-oe/recipes-support/nss/{nss_3.54.bb => nss_3.56.bb} (99%)
>
> diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> index 1a87a0577f..f1f76bd1b7 100644
> --- a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> +++ b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> @@ -14,21 +14,18 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> nss/lib/freebl/gcm.c | 2 ++
> 2 files changed, 6 insertions(+)
>
> -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
> -index f99f769..b0ec81b 100644
> --- a/nss/lib/freebl/Makefile
> +++ b/nss/lib/freebl/Makefile
> -@@ -125,6 +125,9 @@ else
> - DEFINES += -DNSS_X86
> +@@ -126,6 +126,8 @@ else
> endif
> endif
> -+
> + ifdef NS_USE_GCC
> +ifdef NSS_USE_ARM_HW_CRYPTO
> + DEFINES += -DNSS_USE_ARM_HW_CRYPTO
> ifeq ($(CPU_ARCH),aarch64)
> - DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
> - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
> -@@ -148,6 +151,7 @@ endif
> + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
> + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c
> +@@ -150,6 +152,7 @@ endif
> endif
> endif
> endif
> @@ -36,23 +33,14 @@ index f99f769..b0ec81b 100644
>
> ifeq ($(OS_TARGET),OSF1)
> DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
> -diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
> -index c2cc18d..b77f573 100644
> --- a/nss/lib/freebl/gcm.c
> +++ b/nss/lib/freebl/gcm.c
> -@@ -18,6 +18,7 @@
> +@@ -20,7 +20,7 @@
>
> - #include <limits.h>
> -
> -+#ifdef NSS_USE_ARM_HW_CRYPTO
> /* old gcc doesn't support some poly64x2_t intrinsic */
> #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
> - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> -@@ -27,6 +28,7 @@
> - /* We don't test on big endian platform, so disable this on big endian. */
> +- (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> ++ (defined(__clang__) && defined(NSS_USE_ARM_HW_CRYPTO) || defined(__GNUC__) && __GNUC__ > 6)
> #define USE_ARM_GCM
> - #endif
> -+#endif
> -
> - /* Forward declarations */
> - SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
> + #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
> + !defined(NSS_DISABLE_ARM32_NEON)
> diff --git a/meta-oe/recipes-support/nss/nss_3.54.bb b/meta-oe/recipes-support/nss/nss_3.56.bb
> similarity index 99%
> rename from meta-oe/recipes-support/nss/nss_3.54.bb
> rename to meta-oe/recipes-support/nss/nss_3.56.bb
> index 1cc94735bb..4aa5d29ec2 100644
> --- a/meta-oe/recipes-support/nss/nss_3.54.bb
> +++ b/meta-oe/recipes-support/nss/nss_3.56.bb
> @@ -34,8 +34,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
> file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
> file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \
> "
> -
> -SRC_URI[sha256sum] = "dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43"
> +SRC_URI[sha256sum] = "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c"
>
> UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
> UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH v2] nss: Upgrade to 3.56
2020-08-28 14:43 ` [oe] " akuster
@ 2020-08-28 15:14 ` Martin Jansa
2020-08-28 17:03 ` Khem Raj
0 siblings, 1 reply; 7+ messages in thread
From: Martin Jansa @ 2020-08-28 15:14 UTC (permalink / raw)
To: akuster; +Cc: Khem Raj, openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 5119 bytes --]
I'm seeing this postinst issue already without Khem's nss changes, I guess
it is caused by:
31552510b1 nss: fix postinst script for nativesdk build
On Fri, Aug 28, 2020 at 4:43 PM akuster <akuster808@gmail.com> wrote:
>
>
> On 8/27/20 7:04 PM, Khem Raj wrote:
> > Forward port
> 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > v2: Update armv8 hw crypto patch to work on arm32
>
> Did you add this to an image?
>
> I am seeing new error when nss is appended to an image.
>
> WARNING: security-build-image-1.0-r0 do_rootfs: nss.postinst returned 127,
> marking as unpacked only, configuration required on target.
> 2020-08-28 02:07:33 - ERROR - ERROR: security-build-image-1.0-r0
> do_rootfs: Postinstall scriptlets of ['nss'] have failed. If the intention
> is to defer them to first boot,
> 2020-08-28 02:07:33 - ERROR - then please place them into
> pkg_postinst_ontarget_${PN} ().
> 2020-08-28 02:07:33 - ERROR - Deferring to first boot via 'exit 1' is
> no longer supported.
>
> - Armin
>
> >
> > ...figure-option-to-disable-ARM-HW-cryp.patch | 32 ++++++-------------
> > .../nss/{nss_3.54.bb => nss_3.56.bb} | 3 +-
> > 2 files changed, 11 insertions(+), 24 deletions(-)
> > rename meta-oe/recipes-support/nss/{nss_3.54.bb => nss_3.56.bb} (99%)
> >
> > diff --git
> a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > index 1a87a0577f..f1f76bd1b7 100644
> > ---
> a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > +++
> b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > @@ -14,21 +14,18 @@ Signed-off-by: Alexander Kanavin <
> alex.kanavin@gmail.com>
> > nss/lib/freebl/gcm.c | 2 ++
> > 2 files changed, 6 insertions(+)
> >
> > -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
> > -index f99f769..b0ec81b 100644
> > --- a/nss/lib/freebl/Makefile
> > +++ b/nss/lib/freebl/Makefile
> > -@@ -125,6 +125,9 @@ else
> > - DEFINES += -DNSS_X86
> > +@@ -126,6 +126,8 @@ else
> > endif
> > endif
> > -+
> > + ifdef NS_USE_GCC
> > +ifdef NSS_USE_ARM_HW_CRYPTO
> > + DEFINES += -DNSS_USE_ARM_HW_CRYPTO
> > ifeq ($(CPU_ARCH),aarch64)
> > - DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
> > - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
> > -@@ -148,6 +151,7 @@ endif
> > + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
> > + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c
> > +@@ -150,6 +152,7 @@ endif
> > endif
> > endif
> > endif
> > @@ -36,23 +33,14 @@ index f99f769..b0ec81b 100644
> >
> > ifeq ($(OS_TARGET),OSF1)
> > DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
> > -diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
> > -index c2cc18d..b77f573 100644
> > --- a/nss/lib/freebl/gcm.c
> > +++ b/nss/lib/freebl/gcm.c
> > -@@ -18,6 +18,7 @@
> > +@@ -20,7 +20,7 @@
> >
> > - #include <limits.h>
> > -
> > -+#ifdef NSS_USE_ARM_HW_CRYPTO
> > /* old gcc doesn't support some poly64x2_t intrinsic */
> > #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
> > - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> > -@@ -27,6 +28,7 @@
> > - /* We don't test on big endian platform, so disable this on big
> endian. */
> > +- (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> > ++ (defined(__clang__) && defined(NSS_USE_ARM_HW_CRYPTO) ||
> defined(__GNUC__) && __GNUC__ > 6)
> > #define USE_ARM_GCM
> > - #endif
> > -+#endif
> > -
> > - /* Forward declarations */
> > - SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
> > + #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
> > + !defined(NSS_DISABLE_ARM32_NEON)
> > diff --git a/meta-oe/recipes-support/nss/nss_3.54.bb
> b/meta-oe/recipes-support/nss/nss_3.56.bb
> > similarity index 99%
> > rename from meta-oe/recipes-support/nss/nss_3.54.bb
> > rename to meta-oe/recipes-support/nss/nss_3.56.bb
> > index 1cc94735bb..4aa5d29ec2 100644
> > --- a/meta-oe/recipes-support/nss/nss_3.54.bb
> > +++ b/meta-oe/recipes-support/nss/nss_3.56.bb
> > @@ -34,8 +34,7 @@ SRC_URI = "
> http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
> >
> file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
> > file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \
> > "
> > -
> > -SRC_URI[sha256sum] =
> "dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43"
> > +SRC_URI[sha256sum] =
> "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c"
> >
> > UPSTREAM_CHECK_URI = "
> https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases
> "
> > UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
> >
> >
>
>
>
[-- Attachment #2: Type: text/html, Size: 7174 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH v2] nss: Upgrade to 3.56
2020-08-28 15:14 ` Martin Jansa
@ 2020-08-28 17:03 ` Khem Raj
2020-08-28 17:18 ` Martin Jansa
2020-08-31 7:07 ` Mikko Rapeli
0 siblings, 2 replies; 7+ messages in thread
From: Khem Raj @ 2020-08-28 17:03 UTC (permalink / raw)
To: Martin Jansa, akuster; +Cc: openembedded-devel, Mikko Rapeli
On 8/28/20 8:14 AM, Martin Jansa wrote:
> I'm seeing this postinst issue already without Khem's nss changes, I
> guess it is caused by:
> 31552510b1 nss: fix postinst script for nativesdk build
>
seems so. Although my upgrade patch had compile issues during build
which are fixed now.
perhaps we should revert 31552510b1 unless there is a better fix Mikko
any ideas ?
> On Fri, Aug 28, 2020 at 4:43 PM akuster <akuster808@gmail.com
> <mailto:akuster808@gmail.com>> wrote:
>
>
>
> On 8/27/20 7:04 PM, Khem Raj wrote:
> > Forward port
> 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com
> <mailto:raj.khem@gmail.com>>
> > ---
> > v2: Update armv8 hw crypto patch to work on arm32
>
> Did you add this to an image?
>
> I am seeing new error when nss is appended to an image.
>
> WARNING: security-build-image-1.0-r0 do_rootfs: nss.postinst
> returned 127, marking as unpacked only, configuration required on
> target.
> 2020-08-28 02:07:33 - ERROR - ERROR: security-build-image-1.0-r0
> do_rootfs: Postinstall scriptlets of ['nss'] have failed. If the
> intention is to defer them to first boot,
> 2020-08-28 02:07:33 - ERROR - then please place them into
> pkg_postinst_ontarget_${PN} ().
> 2020-08-28 02:07:33 - ERROR - Deferring to first boot via 'exit
> 1' is no longer supported.
>
> - Armin
>
> >
> > ...figure-option-to-disable-ARM-HW-cryp.patch | 32
> ++++++-------------
> > .../nss/{nss_3.54.bb <http://nss_3.54.bb> => nss_3.56.bb
> <http://nss_3.56.bb>} | 3 +-
> > 2 files changed, 11 insertions(+), 24 deletions(-)
> > rename meta-oe/recipes-support/nss/{nss_3.54.bb
> <http://nss_3.54.bb> => nss_3.56.bb <http://nss_3.56.bb>} (99%)
> >
> > diff --git
> a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > index 1a87a0577f..f1f76bd1b7 100644
> > ---
> a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > +++
> b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > @@ -14,21 +14,18 @@ Signed-off-by: Alexander Kanavin
> <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>>
> > nss/lib/freebl/gcm.c | 2 ++
> > 2 files changed, 6 insertions(+)
> >
> > -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
> > -index f99f769..b0ec81b 100644
> > --- a/nss/lib/freebl/Makefile
> > +++ b/nss/lib/freebl/Makefile
> > -@@ -125,6 +125,9 @@ else
> > - DEFINES += -DNSS_X86
> > +@@ -126,6 +126,8 @@ else
> > endif
> > endif
> > -+
> > + ifdef NS_USE_GCC
> > +ifdef NSS_USE_ARM_HW_CRYPTO
> > + DEFINES += -DNSS_USE_ARM_HW_CRYPTO
> > ifeq ($(CPU_ARCH),aarch64)
> > - DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
> > - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
> > -@@ -148,6 +151,7 @@ endif
> > + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
> > + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c
> sha256-armv8.c
> > +@@ -150,6 +152,7 @@ endif
> > endif
> > endif
> > endif
> > @@ -36,23 +33,14 @@ index f99f769..b0ec81b 100644
> >
> > ifeq ($(OS_TARGET),OSF1)
> > DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
> > -diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
> > -index c2cc18d..b77f573 100644
> > --- a/nss/lib/freebl/gcm.c
> > +++ b/nss/lib/freebl/gcm.c
> > -@@ -18,6 +18,7 @@
> > +@@ -20,7 +20,7 @@
> >
> > - #include <limits.h>
> > -
> > -+#ifdef NSS_USE_ARM_HW_CRYPTO
> > /* old gcc doesn't support some poly64x2_t intrinsic */
> > #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
> > - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> > -@@ -27,6 +28,7 @@
> > - /* We don't test on big endian platform, so disable this on big
> endian. */
> > +- (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> > ++ (defined(__clang__) && defined(NSS_USE_ARM_HW_CRYPTO) ||
> defined(__GNUC__) && __GNUC__ > 6)
> > #define USE_ARM_GCM
> > - #endif
> > -+#endif
> > -
> > - /* Forward declarations */
> > - SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
> > + #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
> > + !defined(NSS_DISABLE_ARM32_NEON)
> > diff --git a/meta-oe/recipes-support/nss/nss_3.54.bb
> <http://nss_3.54.bb> b/meta-oe/recipes-support/nss/nss_3.56.bb
> <http://nss_3.56.bb>
> > similarity index 99%
> > rename from meta-oe/recipes-support/nss/nss_3.54.bb
> <http://nss_3.54.bb>
> > rename to meta-oe/recipes-support/nss/nss_3.56.bb
> <http://nss_3.56.bb>
> > index 1cc94735bb..4aa5d29ec2 100644
> > --- a/meta-oe/recipes-support/nss/nss_3.54.bb <http://nss_3.54.bb>
> > +++ b/meta-oe/recipes-support/nss/nss_3.56.bb <http://nss_3.56.bb>
> > @@ -34,8 +34,7 @@ SRC_URI =
> "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
> <http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$%7BVERSIO>
> >
> file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
> >
> file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \
> > "
> > -
> > -SRC_URI[sha256sum] =
> "dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43"
> > +SRC_URI[sha256sum] =
> "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c"
> >
> > UPSTREAM_CHECK_URI =
> "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
> > UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
> >
> >
>
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH v2] nss: Upgrade to 3.56
2020-08-28 17:03 ` Khem Raj
@ 2020-08-28 17:18 ` Martin Jansa
2020-08-28 17:28 ` Khem Raj
2020-08-31 7:07 ` Mikko Rapeli
1 sibling, 1 reply; 7+ messages in thread
From: Martin Jansa @ 2020-08-28 17:18 UTC (permalink / raw)
To: Khem Raj; +Cc: akuster, openembedded-devel, Mikko Rapeli
[-- Attachment #1: Type: text/plain, Size: 6879 bytes --]
I'm testing a fix for target, would be nice if Mikko can confirm nativesdk
works with it - will send it later today.
On Fri, Aug 28, 2020 at 7:03 PM Khem Raj <raj.khem@gmail.com> wrote:
>
>
> On 8/28/20 8:14 AM, Martin Jansa wrote:
> > I'm seeing this postinst issue already without Khem's nss changes, I
> > guess it is caused by:
> > 31552510b1 nss: fix postinst script for nativesdk build
> >
>
> seems so. Although my upgrade patch had compile issues during build
> which are fixed now.
>
> perhaps we should revert 31552510b1 unless there is a better fix Mikko
> any ideas ?
>
> > On Fri, Aug 28, 2020 at 4:43 PM akuster <akuster808@gmail.com
> > <mailto:akuster808@gmail.com>> wrote:
> >
> >
> >
> > On 8/27/20 7:04 PM, Khem Raj wrote:
> > > Forward port
> > 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > >
> > > Signed-off-by: Khem Raj <raj.khem@gmail.com
> > <mailto:raj.khem@gmail.com>>
> > > ---
> > > v2: Update armv8 hw crypto patch to work on arm32
> >
> > Did you add this to an image?
> >
> > I am seeing new error when nss is appended to an image.
> >
> > WARNING: security-build-image-1.0-r0 do_rootfs: nss.postinst
> > returned 127, marking as unpacked only, configuration required on
> > target.
> > 2020-08-28 02:07:33 - ERROR - ERROR: security-build-image-1.0-r0
> > do_rootfs: Postinstall scriptlets of ['nss'] have failed. If the
> > intention is to defer them to first boot,
> > 2020-08-28 02:07:33 - ERROR - then please place them into
> > pkg_postinst_ontarget_${PN} ().
> > 2020-08-28 02:07:33 - ERROR - Deferring to first boot via 'exit
> > 1' is no longer supported.
> >
> > - Armin
> >
> > >
> > > ...figure-option-to-disable-ARM-HW-cryp.patch | 32
> > ++++++-------------
> > > .../nss/{nss_3.54.bb <http://nss_3.54.bb> => nss_3.56.bb
> > <http://nss_3.56.bb>} | 3 +-
> > > 2 files changed, 11 insertions(+), 24 deletions(-)
> > > rename meta-oe/recipes-support/nss/{nss_3.54.bb
> > <http://nss_3.54.bb> => nss_3.56.bb <http://nss_3.56.bb>} (99%)
> > >
> > > diff --git
> >
> a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> >
> b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > > index 1a87a0577f..f1f76bd1b7 100644
> > > ---
> >
> a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > > +++
> >
> b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > > @@ -14,21 +14,18 @@ Signed-off-by: Alexander Kanavin
> > <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>>
> > > nss/lib/freebl/gcm.c | 2 ++
> > > 2 files changed, 6 insertions(+)
> > >
> > > -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
> > > -index f99f769..b0ec81b 100644
> > > --- a/nss/lib/freebl/Makefile
> > > +++ b/nss/lib/freebl/Makefile
> > > -@@ -125,6 +125,9 @@ else
> > > - DEFINES += -DNSS_X86
> > > +@@ -126,6 +126,8 @@ else
> > > endif
> > > endif
> > > -+
> > > + ifdef NS_USE_GCC
> > > +ifdef NSS_USE_ARM_HW_CRYPTO
> > > + DEFINES += -DNSS_USE_ARM_HW_CRYPTO
> > > ifeq ($(CPU_ARCH),aarch64)
> > > - DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
> > > - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
> > > -@@ -148,6 +151,7 @@ endif
> > > + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
> > > + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c
> > sha256-armv8.c
> > > +@@ -150,6 +152,7 @@ endif
> > > endif
> > > endif
> > > endif
> > > @@ -36,23 +33,14 @@ index f99f769..b0ec81b 100644
> > >
> > > ifeq ($(OS_TARGET),OSF1)
> > > DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
> > > -diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
> > > -index c2cc18d..b77f573 100644
> > > --- a/nss/lib/freebl/gcm.c
> > > +++ b/nss/lib/freebl/gcm.c
> > > -@@ -18,6 +18,7 @@
> > > +@@ -20,7 +20,7 @@
> > >
> > > - #include <limits.h>
> > > -
> > > -+#ifdef NSS_USE_ARM_HW_CRYPTO
> > > /* old gcc doesn't support some poly64x2_t intrinsic */
> > > #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
> > > - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> > > -@@ -27,6 +28,7 @@
> > > - /* We don't test on big endian platform, so disable this on big
> > endian. */
> > > +- (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> > > ++ (defined(__clang__) && defined(NSS_USE_ARM_HW_CRYPTO) ||
> > defined(__GNUC__) && __GNUC__ > 6)
> > > #define USE_ARM_GCM
> > > - #endif
> > > -+#endif
> > > -
> > > - /* Forward declarations */
> > > - SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
> > > + #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
> > > + !defined(NSS_DISABLE_ARM32_NEON)
> > > diff --git a/meta-oe/recipes-support/nss/nss_3.54.bb
> > <http://nss_3.54.bb> b/meta-oe/recipes-support/nss/nss_3.56.bb
> > <http://nss_3.56.bb>
> > > similarity index 99%
> > > rename from meta-oe/recipes-support/nss/nss_3.54.bb
> > <http://nss_3.54.bb>
> > > rename to meta-oe/recipes-support/nss/nss_3.56.bb
> > <http://nss_3.56.bb>
> > > index 1cc94735bb..4aa5d29ec2 100644
> > > --- a/meta-oe/recipes-support/nss/nss_3.54.bb <http://nss_3.54.bb
> >
> > > +++ b/meta-oe/recipes-support/nss/nss_3.56.bb <http://nss_3.56.bb
> >
> > > @@ -34,8 +34,7 @@ SRC_URI =
> > "
> http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
> > <
> http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$%7BVERSIO>
> > >
> >
> file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
> > >
> > file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \
> > > "
> > > -
> > > -SRC_URI[sha256sum] =
> > "dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43"
> > > +SRC_URI[sha256sum] =
> > "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c"
> > >
> > > UPSTREAM_CHECK_URI =
> > "
> https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases
> "
> > > UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
> > >
> > >
> >
> >
> >
>
[-- Attachment #2: Type: text/html, Size: 10988 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH v2] nss: Upgrade to 3.56
2020-08-28 17:18 ` Martin Jansa
@ 2020-08-28 17:28 ` Khem Raj
0 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2020-08-28 17:28 UTC (permalink / raw)
To: Martin Jansa; +Cc: akuster, openembedded-devel, Mikko Rapeli
Thanks Martin
On 8/28/20 10:18 AM, Martin Jansa wrote:
> I'm testing a fix for target, would be nice if Mikko can confirm
> nativesdk works with it - will send it later today.
>
> On Fri, Aug 28, 2020 at 7:03 PM Khem Raj <raj.khem@gmail.com
> <mailto:raj.khem@gmail.com>> wrote:
>
>
>
> On 8/28/20 8:14 AM, Martin Jansa wrote:
> > I'm seeing this postinst issue already without Khem's nss changes, I
> > guess it is caused by:
> > 31552510b1 nss: fix postinst script for nativesdk build
> >
>
> seems so. Although my upgrade patch had compile issues during build
> which are fixed now.
>
> perhaps we should revert 31552510b1 unless there is a better fix Mikko
> any ideas ?
>
> > On Fri, Aug 28, 2020 at 4:43 PM akuster <akuster808@gmail.com
> <mailto:akuster808@gmail.com>
> > <mailto:akuster808@gmail.com <mailto:akuster808@gmail.com>>> wrote:
> >
> >
> >
> > On 8/27/20 7:04 PM, Khem Raj wrote:
> > > Forward port
> > 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > >
> > > Signed-off-by: Khem Raj <raj.khem@gmail.com
> <mailto:raj.khem@gmail.com>
> > <mailto:raj.khem@gmail.com <mailto:raj.khem@gmail.com>>>
> > > ---
> > > v2: Update armv8 hw crypto patch to work on arm32
> >
> > Did you add this to an image?
> >
> > I am seeing new error when nss is appended to an image.
> >
> > WARNING: security-build-image-1.0-r0 do_rootfs: nss.postinst
> > returned 127, marking as unpacked only, configuration required on
> > target.
> > 2020-08-28 02:07:33 - ERROR - ERROR:
> security-build-image-1.0-r0
> > do_rootfs: Postinstall scriptlets of ['nss'] have failed. If the
> > intention is to defer them to first boot,
> > 2020-08-28 02:07:33 - ERROR - then please place them into
> > pkg_postinst_ontarget_${PN} ().
> > 2020-08-28 02:07:33 - ERROR - Deferring to first boot via
> 'exit
> > 1' is no longer supported.
> >
> > - Armin
> >
> > >
> > > ...figure-option-to-disable-ARM-HW-cryp.patch | 32
> > ++++++-------------
> > > .../nss/{nss_3.54.bb <http://nss_3.54.bb>
> <http://nss_3.54.bb> => nss_3.56.bb <http://nss_3.56.bb>
> > <http://nss_3.56.bb>} | 3 +-
> > > 2 files changed, 11 insertions(+), 24 deletions(-)
> > > rename meta-oe/recipes-support/nss/{nss_3.54.bb
> <http://nss_3.54.bb>
> > <http://nss_3.54.bb> => nss_3.56.bb <http://nss_3.56.bb>
> <http://nss_3.56.bb>} (99%)
> > >
> > > diff --git
> >
> a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> >
> b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > > index 1a87a0577f..f1f76bd1b7 100644
> > > ---
> >
> a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > > +++
> >
> b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > > @@ -14,21 +14,18 @@ Signed-off-by: Alexander Kanavin
> > <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>
> <mailto:alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>>>
> > > nss/lib/freebl/gcm.c | 2 ++
> > > 2 files changed, 6 insertions(+)
> > >
> > > -diff --git a/nss/lib/freebl/Makefile
> b/nss/lib/freebl/Makefile
> > > -index f99f769..b0ec81b 100644
> > > --- a/nss/lib/freebl/Makefile
> > > +++ b/nss/lib/freebl/Makefile
> > > -@@ -125,6 +125,9 @@ else
> > > - DEFINES += -DNSS_X86
> > > +@@ -126,6 +126,8 @@ else
> > > endif
> > > endif
> > > -+
> > > + ifdef NS_USE_GCC
> > > +ifdef NSS_USE_ARM_HW_CRYPTO
> > > + DEFINES += -DNSS_USE_ARM_HW_CRYPTO
> > > ifeq ($(CPU_ARCH),aarch64)
> > > - DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
> > > - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
> > > -@@ -148,6 +151,7 @@ endif
> > > + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
> > > + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c
> > sha256-armv8.c
> > > +@@ -150,6 +152,7 @@ endif
> > > endif
> > > endif
> > > endif
> > > @@ -36,23 +33,14 @@ index f99f769..b0ec81b 100644
> > >
> > > ifeq ($(OS_TARGET),OSF1)
> > > DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
> > > -diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
> > > -index c2cc18d..b77f573 100644
> > > --- a/nss/lib/freebl/gcm.c
> > > +++ b/nss/lib/freebl/gcm.c
> > > -@@ -18,6 +18,7 @@
> > > +@@ -20,7 +20,7 @@
> > >
> > > - #include <limits.h>
> > > -
> > > -+#ifdef NSS_USE_ARM_HW_CRYPTO
> > > /* old gcc doesn't support some poly64x2_t intrinsic */
> > > #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
> > > - (defined(__clang__) || defined(__GNUC__) && __GNUC__
> > 6)
> > > -@@ -27,6 +28,7 @@
> > > - /* We don't test on big endian platform, so disable this
> on big
> > endian. */
> > > +- (defined(__clang__) || defined(__GNUC__) && __GNUC__
> > 6)
> > > ++ (defined(__clang__) && defined(NSS_USE_ARM_HW_CRYPTO) ||
> > defined(__GNUC__) && __GNUC__ > 6)
> > > #define USE_ARM_GCM
> > > - #endif
> > > -+#endif
> > > -
> > > - /* Forward declarations */
> > > - SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
> > > + #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
> > > + !defined(NSS_DISABLE_ARM32_NEON)
> > > diff --git a/meta-oe/recipes-support/nss/nss_3.54.bb
> <http://nss_3.54.bb>
> > <http://nss_3.54.bb>
> b/meta-oe/recipes-support/nss/nss_3.56.bb <http://nss_3.56.bb>
> > <http://nss_3.56.bb>
> > > similarity index 99%
> > > rename from meta-oe/recipes-support/nss/nss_3.54.bb
> <http://nss_3.54.bb>
> > <http://nss_3.54.bb>
> > > rename to meta-oe/recipes-support/nss/nss_3.56.bb
> <http://nss_3.56.bb>
> > <http://nss_3.56.bb>
> > > index 1cc94735bb..4aa5d29ec2 100644
> > > --- a/meta-oe/recipes-support/nss/nss_3.54.bb
> <http://nss_3.54.bb> <http://nss_3.54.bb>
> > > +++ b/meta-oe/recipes-support/nss/nss_3.56.bb
> <http://nss_3.56.bb> <http://nss_3.56.bb>
> > > @@ -34,8 +34,7 @@ SRC_URI =
> >
> "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO <http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$%7BVERSIO>
> >
> <http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$%7BVERSIO>
> > >
> >
> file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
> > >
> > file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \
> > > "
> > > -
> > > -SRC_URI[sha256sum] =
> >
> "dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43"
> > > +SRC_URI[sha256sum] =
> >
> "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c"
> > >
> > > UPSTREAM_CHECK_URI =
> >
> "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
> > > UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
> > >
> > >
> >
> >
> >
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH v2] nss: Upgrade to 3.56
2020-08-28 17:03 ` Khem Raj
2020-08-28 17:18 ` Martin Jansa
@ 2020-08-31 7:07 ` Mikko Rapeli
1 sibling, 0 replies; 7+ messages in thread
From: Mikko Rapeli @ 2020-08-31 7:07 UTC (permalink / raw)
To: raj.khem; +Cc: martin.jansa, akuster808, openembedded-devel
On Fri, Aug 28, 2020 at 10:03:39AM -0700, Khem Raj wrote:
>
>
> On 8/28/20 8:14 AM, Martin Jansa wrote:
> > I'm seeing this postinst issue already without Khem's nss changes, I
> > guess it is caused by:
> > 31552510b1 nss: fix postinst script for nativesdk build
> >
>
> seems so. Although my upgrade patch had compile issues during build which
> are fixed now.
>
> perhaps we should revert 31552510b1 unless there is a better fix Mikko any
> ideas ?
I'm catching up on emails but checking this now.
-Mikko
> > On Fri, Aug 28, 2020 at 4:43 PM akuster <akuster808@gmail.com
> > <mailto:akuster808@gmail.com>> wrote:
> >
> >
> >
> > On 8/27/20 7:04 PM, Khem Raj wrote:
> > > Forward port
> > 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > >
> > > Signed-off-by: Khem Raj <raj.khem@gmail.com
> > <mailto:raj.khem@gmail.com>>
> > > ---
> > > v2: Update armv8 hw crypto patch to work on arm32
> >
> > Did you add this to an image?
> >
> > I am seeing new error when nss is appended to an image.
> >
> > WARNING: security-build-image-1.0-r0 do_rootfs: nss.postinst
> > returned 127, marking as unpacked only, configuration required on
> > target.
> > 2020-08-28 02:07:33 - ERROR - ERROR: security-build-image-1.0-r0
> > do_rootfs: Postinstall scriptlets of ['nss'] have failed. If the
> > intention is to defer them to first boot,
> > 2020-08-28 02:07:33 - ERROR - then please place them into
> > pkg_postinst_ontarget_${PN} ().
> > 2020-08-28 02:07:33 - ERROR - Deferring to first boot via 'exit
> > 1' is no longer supported.
> >
> > - Armin
> >
> > >
> > > ...figure-option-to-disable-ARM-HW-cryp.patch | 32
> > ++++++-------------
> > > .../nss/{nss_3.54.bb <http://nss_3.54.bb> => nss_3.56.bb
> > <http://nss_3.56.bb>} | 3 +-
> > > 2 files changed, 11 insertions(+), 24 deletions(-)
> > > rename meta-oe/recipes-support/nss/{nss_3.54.bb
> > <http://nss_3.54.bb> => nss_3.56.bb <http://nss_3.56.bb>} (99%)
> > >
> > > diff --git
> > a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > > index 1a87a0577f..f1f76bd1b7 100644
> > > ---
> > a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > > +++
> > b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > > @@ -14,21 +14,18 @@ Signed-off-by: Alexander Kanavin
> > <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>>
> > > nss/lib/freebl/gcm.c | 2 ++
> > > 2 files changed, 6 insertions(+)
> > >
> > > -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
> > > -index f99f769..b0ec81b 100644
> > > --- a/nss/lib/freebl/Makefile
> > > +++ b/nss/lib/freebl/Makefile
> > > -@@ -125,6 +125,9 @@ else
> > > - DEFINES += -DNSS_X86
> > > +@@ -126,6 +126,8 @@ else
> > > endif
> > > endif
> > > -+
> > > + ifdef NS_USE_GCC
> > > +ifdef NSS_USE_ARM_HW_CRYPTO
> > > + DEFINES += -DNSS_USE_ARM_HW_CRYPTO
> > > ifeq ($(CPU_ARCH),aarch64)
> > > - DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
> > > - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
> > > -@@ -148,6 +151,7 @@ endif
> > > + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
> > > + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c
> > sha256-armv8.c
> > > +@@ -150,6 +152,7 @@ endif
> > > endif
> > > endif
> > > endif
> > > @@ -36,23 +33,14 @@ index f99f769..b0ec81b 100644
> > >
> > > ifeq ($(OS_TARGET),OSF1)
> > > DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
> > > -diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
> > > -index c2cc18d..b77f573 100644
> > > --- a/nss/lib/freebl/gcm.c
> > > +++ b/nss/lib/freebl/gcm.c
> > > -@@ -18,6 +18,7 @@
> > > +@@ -20,7 +20,7 @@
> > >
> > > - #include <limits.h>
> > > -
> > > -+#ifdef NSS_USE_ARM_HW_CRYPTO
> > > /* old gcc doesn't support some poly64x2_t intrinsic */
> > > #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
> > > - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> > > -@@ -27,6 +28,7 @@
> > > - /* We don't test on big endian platform, so disable this on big
> > endian. */
> > > +- (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> > > ++ (defined(__clang__) && defined(NSS_USE_ARM_HW_CRYPTO) ||
> > defined(__GNUC__) && __GNUC__ > 6)
> > > #define USE_ARM_GCM
> > > - #endif
> > > -+#endif
> > > -
> > > - /* Forward declarations */
> > > - SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
> > > + #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
> > > + !defined(NSS_DISABLE_ARM32_NEON)
> > > diff --git a/meta-oe/recipes-support/nss/nss_3.54.bb
> > <http://nss_3.54.bb> b/meta-oe/recipes-support/nss/nss_3.56.bb
> > <http://nss_3.56.bb>
> > > similarity index 99%
> > > rename from meta-oe/recipes-support/nss/nss_3.54.bb
> > <http://nss_3.54.bb>
> > > rename to meta-oe/recipes-support/nss/nss_3.56.bb
> > <http://nss_3.56.bb>
> > > index 1cc94735bb..4aa5d29ec2 100644
> > > --- a/meta-oe/recipes-support/nss/nss_3.54.bb <http://nss_3.54.bb>
> > > +++ b/meta-oe/recipes-support/nss/nss_3.56.bb <http://nss_3.56.bb>
> > > @@ -34,8 +34,7 @@ SRC_URI =
> > "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
> > <http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$%7BVERSIO>
> > >
> > file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
> > \
> > >
> > file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \
> > > "
> > > -
> > > -SRC_URI[sha256sum] =
> > "dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43"
> > > +SRC_URI[sha256sum] =
> > "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c"
> > >
> > > UPSTREAM_CHECK_URI =
> > "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
> > > UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
> > >
> > >
> >
> >
> >
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-08-31 7:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-28 2:04 [meta-oe][PATCH v2] nss: Upgrade to 3.56 Khem Raj
2020-08-28 14:43 ` [oe] " akuster
2020-08-28 15:14 ` Martin Jansa
2020-08-28 17:03 ` Khem Raj
2020-08-28 17:18 ` Martin Jansa
2020-08-28 17:28 ` Khem Raj
2020-08-31 7:07 ` Mikko Rapeli
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.