Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
On 10 July 2013 09:03, Hongxu Jia hongxu@windriver.com wrote: Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 v3 certificates, and other security standards. What's the rationale for putting this into oe-core instead of updating the recipe in meta-browser? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
On 11 July 2013 11:40, Burton, Ross ross.bur...@intel.com wrote: On 10 July 2013 09:03, Hongxu Jia hongxu@windriver.com wrote: Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 v3 certificates, and other security standards. What's the rationale for putting this into oe-core instead of updating the recipe in meta-browser? Of course if I actually read the other mails I'd see it was for LSB. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
On Thu, 2013-07-11 at 11:41 +0100, Burton, Ross wrote: On 11 July 2013 11:40, Burton, Ross ross.bur...@intel.com wrote: On 10 July 2013 09:03, Hongxu Jia hongxu@windriver.com wrote: Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 v3 certificates, and other security standards. What's the rationale for putting this into oe-core instead of updating the recipe in meta-browser? Of course if I actually read the other mails I'd see it was for LSB. I think you could still legitimately question whether having recipes in oe-core that are just for LSB is sensible and/or desirable, not least because dangling libraries that don't have any users are hard to test. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
On 11 July 2013 11:45, Phil Blundell p...@pbcl.net wrote: I think you could still legitimately question whether having recipes in oe-core that are just for LSB is sensible and/or desirable, not least because dangling libraries that don't have any users are hard to test. I was just pondering the idea of a meta-lsb... Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
On 07/11/2013 07:14 PM, Burton, Ross wrote: On 11 July 2013 11:45, Phil Blundell p...@pbcl.net wrote: I think you could still legitimately question whether having recipes in oe-core that are just for LSB is sensible and/or desirable, not least because dangling libraries that don't have any users are hard to test. I was just pondering the idea of a meta-lsb... The reason why I choose to put nss into oe-core is I found nspr in oe-core. They both used for lsb-test and come from mozilla. Anyone has a better idea about where to put? https://developer.mozilla.org/en-US/docs/NSS https://developer.mozilla.org/en-US/docs/NSPR //Hongxu Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
On Thu, 2013-07-11 at 12:14 +0100, Burton, Ross wrote: On 11 July 2013 11:45, Phil Blundell p...@pbcl.net wrote: I think you could still legitimately question whether having recipes in oe-core that are just for LSB is sensible and/or desirable, not least because dangling libraries that don't have any users are hard to test. I was just pondering the idea of a meta-lsb... Yeah, I was thinking about that too. The obvious downside of this plan is that this layer would end up containing a random-looking grab-bag of recipes with nothing in common other than that they're needed for LSB conformance and not in oe-core. In practice that's probably going to mean that the majority of them would duplicate recipes from other layers (e.g. meta-browser in the nss case) which doesn't seem like a very satisfactory state of affairs. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
On 11 July 2013 12:34, Phil Blundell p...@pbcl.net wrote: I was just pondering the idea of a meta-lsb... Yeah, I was thinking about that too. The obvious downside of this plan is that this layer would end up containing a random-looking grab-bag of recipes with nothing in common other than that they're needed for LSB conformance and not in oe-core. In practice that's probably going to mean that the majority of them would duplicate recipes from other layers (e.g. meta-browser in the nss case) which doesn't seem like a very satisfactory state of affairs. That's pretty much exactly my thoughts. Two less than ideal situations, one less worse than the other (LSB in oe-core being less worse, in my opinion). Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] nss: add version 3.15.1
Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 v3 certificates, and other security standards. [YOCTO #4096] Signed-off-by: Hongxu Jia hongxu@windriver.com --- .../files/nss-fix-support-cross-compiling.patch| 71 + .../files/nss-no-rpath-for-cross-compiling.patch | 26 meta/recipes-support/nss/files/nss.pc.in | 11 ++ meta/recipes-support/nss/nss.inc | 170 + meta/recipes-support/nss/nss_3.15.1.bb | 9 ++ 5 files changed, 287 insertions(+) create mode 100644 meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch create mode 100644 meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch create mode 100644 meta/recipes-support/nss/files/nss.pc.in create mode 100644 meta/recipes-support/nss/nss.inc create mode 100644 meta/recipes-support/nss/nss_3.15.1.bb diff --git a/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch new file mode 100644 index 000..f0b3550 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch @@ -0,0 +1,71 @@ +nss: fix support cross compiling + +Let some make variables be assigned from outside makefile. + +Signed-off-by: Hongxu Jia hongxu@windriver.com +Upstream-Status: Inappropriate [configuration] +--- + nss/coreconf/Linux.mk | 12 +++- + nss/coreconf/arch.mk| 2 +- + nss/lib/freebl/Makefile | 6 ++ + 3 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +--- a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +@@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1) + IMPL_STRATEGY = _PTH + endif + ++ifndef CC + CC= gcc ++endif ++ ++ifdef CXX ++CCC = $(CXX) ++else + CCC = g++ ++endif ++ ++ifndef RANLIB + RANLIB= ranlib ++endif + +-DEFAULT_COMPILER = gcc ++DEFAULT_COMPILER = $(CC) + + ifeq ($(OS_TARGET),Android) + ifndef ANDROID_NDK +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 6557348..b722412 100644 +--- a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +@@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +-OS_RELEASE := $(shell uname -r) ++OS_RELEASE ?= $(shell uname -r) + endif + + # +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 0d293f1..678f506 100644 +--- a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +@@ -36,6 +36,12 @@ ifdef USE_64 + DEFINES += -DNSS_USE_64 + endif + ++ifeq ($(OS_TEST),mips) ++ifndef USE_64 ++ DEFINES += -DNS_PTR_LE_32 ++endif ++endif ++ + ifdef USE_ABI32_FPU + DEFINES += -DNSS_USE_ABI32_FPU + endif +-- +1.8.1.2 + diff --git a/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch new file mode 100644 index 000..7661dc9 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch @@ -0,0 +1,26 @@ +nss:no rpath for cross compiling + +Signed-off-by: Hongxu Jia hongxu@windriver.com +Upstream-Status: Inappropriate [configuration] +--- + nss/cmd/platlibs.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +--- a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +@@ -18,9 +18,9 @@ endif + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' + endif + endif + +-- +1.8.1.2 + diff --git a/meta/recipes-support/nss/files/nss.pc.in b/meta/recipes-support/nss/files/nss.pc.in new file mode 100644 index 000..200f635 --- /dev/null +++ b/meta/recipes-support/nss/files/nss.pc.in @@ -0,0 +1,11 @@ +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr = %NSPR_VERSION% +Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 +Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc new file mode 100644 index 000..87cba38 --- /dev/null +++ b/meta/recipes-support/nss/nss.inc @@ -0,0 +1,170 @@ +SUMMARY = Mozilla's SSL and TLS implementation +DESCRIPTION = Network Security Services (NSS) is a set of libraries \ +designed to support
[OE-core] [PATCH 3/5] nss: add version 3.15.1
Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 v3 certificates, and other security standards. [YOCTO #4096] Signed-off-by: Hongxu Jia hongxu@windriver.com --- .../files/nss-fix-support-cross-compiling.patch| 71 + .../files/nss-no-rpath-for-cross-compiling.patch | 26 meta/recipes-support/nss/files/nss.pc.in | 11 ++ meta/recipes-support/nss/nss.inc | 169 + meta/recipes-support/nss/nss_3.15.1.bb | 9 ++ 5 files changed, 286 insertions(+) create mode 100644 meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch create mode 100644 meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch create mode 100644 meta/recipes-support/nss/files/nss.pc.in create mode 100644 meta/recipes-support/nss/nss.inc create mode 100644 meta/recipes-support/nss/nss_3.15.1.bb diff --git a/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch new file mode 100644 index 000..f0b3550 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch @@ -0,0 +1,71 @@ +nss: fix support cross compiling + +Let some make variables be assigned from outside makefile. + +Signed-off-by: Hongxu Jia hongxu@windriver.com +Upstream-Status: Inappropriate [configuration] +--- + nss/coreconf/Linux.mk | 12 +++- + nss/coreconf/arch.mk| 2 +- + nss/lib/freebl/Makefile | 6 ++ + 3 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +--- a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +@@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1) + IMPL_STRATEGY = _PTH + endif + ++ifndef CC + CC= gcc ++endif ++ ++ifdef CXX ++CCC = $(CXX) ++else + CCC = g++ ++endif ++ ++ifndef RANLIB + RANLIB= ranlib ++endif + +-DEFAULT_COMPILER = gcc ++DEFAULT_COMPILER = $(CC) + + ifeq ($(OS_TARGET),Android) + ifndef ANDROID_NDK +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 6557348..b722412 100644 +--- a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +@@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +-OS_RELEASE := $(shell uname -r) ++OS_RELEASE ?= $(shell uname -r) + endif + + # +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 0d293f1..678f506 100644 +--- a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +@@ -36,6 +36,12 @@ ifdef USE_64 + DEFINES += -DNSS_USE_64 + endif + ++ifeq ($(OS_TEST),mips) ++ifndef USE_64 ++ DEFINES += -DNS_PTR_LE_32 ++endif ++endif ++ + ifdef USE_ABI32_FPU + DEFINES += -DNSS_USE_ABI32_FPU + endif +-- +1.8.1.2 + diff --git a/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch new file mode 100644 index 000..7661dc9 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch @@ -0,0 +1,26 @@ +nss:no rpath for cross compiling + +Signed-off-by: Hongxu Jia hongxu@windriver.com +Upstream-Status: Inappropriate [configuration] +--- + nss/cmd/platlibs.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +--- a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +@@ -18,9 +18,9 @@ endif + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' + endif + endif + +-- +1.8.1.2 + diff --git a/meta/recipes-support/nss/files/nss.pc.in b/meta/recipes-support/nss/files/nss.pc.in new file mode 100644 index 000..200f635 --- /dev/null +++ b/meta/recipes-support/nss/files/nss.pc.in @@ -0,0 +1,11 @@ +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr = %NSPR_VERSION% +Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 +Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc new file mode 100644 index 000..71b7250 --- /dev/null +++ b/meta/recipes-support/nss/nss.inc @@ -0,0 +1,169 @@ +SUMMARY = Mozilla's SSL and TLS implementation +DESCRIPTION = Network Security Services (NSS) is a set of libraries \ +designed to support
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
Hi Hongxu, On Tuesday 09 July 2013 20:30:38 Hongxu Jia wrote: Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 v3 certificates, and other security standards. [YOCTO #4096] Signed-off-by: Hongxu Jia hongxu@windriver.com --- .../files/nss-fix-support-cross-compiling.patch| 71 + .../files/nss-no-rpath-for-cross-compiling.patch | 26 meta/recipes-support/nss/files/nss.pc.in | 11 ++ meta/recipes-support/nss/nss.inc | 169 + meta/recipes-support/nss/nss_3.15.1.bb | 9 ++ 5 files changed, 286 insertions(+) create mode 100644 meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch create mode 100644 meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch create mode 100644 meta/recipes-support/nss/files/nss.pc.in create mode 100644 meta/recipes-support/nss/nss.inc create mode 100644 meta/recipes-support/nss/nss_3.15.1.bb diff --git a/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch new file mode 100644 index 000..f0b3550 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch @@ -0,0 +1,71 @@ +nss: fix support cross compiling + +Let some make variables be assigned from outside makefile. + +Signed-off-by: Hongxu Jia hongxu@windriver.com +Upstream-Status: Inappropriate [configuration] +--- + nss/coreconf/Linux.mk | 12 +++- + nss/coreconf/arch.mk| 2 +- + nss/lib/freebl/Makefile | 6 ++ + 3 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +--- a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +@@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1) + IMPL_STRATEGY = _PTH + endif + ++ifndef CC + CC = gcc ++endif ++ ++ifdef CXX ++CCC = $(CXX) ++else + CCC = g++ ++endif ++ ++ifndef RANLIB + RANLIB = ranlib ++endif + +-DEFAULT_COMPILER = gcc ++DEFAULT_COMPILER = $(CC) + + ifeq ($(OS_TARGET),Android) + ifndef ANDROID_NDK +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 6557348..b722412 100644 +--- a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +@@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +-OS_RELEASE := $(shell uname -r) ++OS_RELEASE ?= $(shell uname -r) + endif + + # +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 0d293f1..678f506 100644 +--- a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +@@ -36,6 +36,12 @@ ifdef USE_64 + DEFINES += -DNSS_USE_64 + endif + ++ifeq ($(OS_TEST),mips) ++ifndef USE_64 ++DEFINES += -DNS_PTR_LE_32 ++endif ++endif ++ + ifdef USE_ABI32_FPU + DEFINES += -DNSS_USE_ABI32_FPU + endif +-- +1.8.1.2 + diff --git a/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch new file mode 100644 index 000..7661dc9 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch @@ -0,0 +1,26 @@ +nss:no rpath for cross compiling + +Signed-off-by: Hongxu Jia hongxu@windriver.com +Upstream-Status: Inappropriate [configuration] +--- + nss/cmd/platlibs.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +--- a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +@@ -18,9 +18,9 @@ endif + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' + endif + endif + +-- +1.8.1.2 + diff --git a/meta/recipes-support/nss/files/nss.pc.in b/meta/recipes-support/nss/files/nss.pc.in new file mode 100644 index 000..200f635 --- /dev/null +++ b/meta/recipes-support/nss/files/nss.pc.in @@ -0,0 +1,11 @@ +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr = %NSPR_VERSION% +Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 +Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc new file mode 100644 index 000..71b7250 --- /dev/null +++
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
Hi Paul,
1, 3.15.1 is the newest version, and file structure has more change than
previous version.
2, 3.13.3 just skip signing, and cheksum file doesn't be generated.
3, 3.13.3 doesn't completely fix incorrect shebang of perl (PATCH 5/5)
4, 3.13.3's package doesn't contain ${D}${bindir}/ and ${D}${sysconfdir}
I think 3.15.1 is better.
//Hongxu
On 07/09/2013 08:44 PM, Paul Eggleton wrote:
Hi Hongxu,
On Tuesday 09 July 2013 20:30:38 Hongxu Jia wrote:
Network Security Services (NSS) is a set of libraries designed to support
cross-platform development of security-enabled client and server
applications. Applications built with NSS can support SSL v2 and v3, TLS,
PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 v3 certificates, and other
security standards.
[YOCTO #4096]
Signed-off-by: Hongxu Jia hongxu@windriver.com
---
.../files/nss-fix-support-cross-compiling.patch| 71 +
.../files/nss-no-rpath-for-cross-compiling.patch | 26
meta/recipes-support/nss/files/nss.pc.in | 11 ++
meta/recipes-support/nss/nss.inc | 169
+ meta/recipes-support/nss/nss_3.15.1.bb |
9 ++
5 files changed, 286 insertions(+)
create mode 100644
meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch create
mode 100644
meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch
create mode 100644 meta/recipes-support/nss/files/nss.pc.in
create mode 100644 meta/recipes-support/nss/nss.inc
create mode 100644 meta/recipes-support/nss/nss_3.15.1.bb
diff --git
a/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch
b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch new
file mode 100644
index 000..f0b3550
--- /dev/null
+++ b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch
@@ -0,0 +1,71 @@
+nss: fix support cross compiling
+
+Let some make variables be assigned from outside makefile.
+
+Signed-off-by: Hongxu Jia hongxu@windriver.com
+Upstream-Status: Inappropriate [configuration]
+---
+ nss/coreconf/Linux.mk | 12 +++-
+ nss/coreconf/arch.mk| 2 +-
+ nss/lib/freebl/Makefile | 6 ++
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
+--- a/nss/coreconf/Linux.mk
b/nss/coreconf/Linux.mk
+@@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1)
+ IMPL_STRATEGY = _PTH
+ endif
+
++ifndef CC
+ CC= gcc
++endif
++
++ifdef CXX
++CCC = $(CXX)
++else
+ CCC = g++
++endif
++
++ifndef RANLIB
+ RANLIB= ranlib
++endif
+
+-DEFAULT_COMPILER = gcc
++DEFAULT_COMPILER = $(CC)
+
+ ifeq ($(OS_TARGET),Android)
+ ifndef ANDROID_NDK
+diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
+index 6557348..b722412 100644
+--- a/nss/coreconf/arch.mk
b/nss/coreconf/arch.mk
+@@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m)
+ ifeq ($(OS_TEST),i86pc)
+ OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+ else
+-OS_RELEASE := $(shell uname -r)
++OS_RELEASE ?= $(shell uname -r)
+ endif
+
+ #
+diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
+index 0d293f1..678f506 100644
+--- a/nss/lib/freebl/Makefile
b/nss/lib/freebl/Makefile
+@@ -36,6 +36,12 @@ ifdef USE_64
+ DEFINES += -DNSS_USE_64
+ endif
+
++ifeq ($(OS_TEST),mips)
++ifndef USE_64
++ DEFINES += -DNS_PTR_LE_32
++endif
++endif
++
+ ifdef USE_ABI32_FPU
+ DEFINES += -DNSS_USE_ABI32_FPU
+ endif
+--
+1.8.1.2
+
diff --git
a/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch
b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch new
file mode 100644
index 000..7661dc9
--- /dev/null
+++ b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch
@@ -0,0 +1,26 @@
+nss:no rpath for cross compiling
+
+Signed-off-by: Hongxu Jia hongxu@windriver.com
+Upstream-Status: Inappropriate [configuration]
+---
+ nss/cmd/platlibs.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk
+--- a/nss/cmd/platlibs.mk
b/nss/cmd/platlibs.mk
+@@ -18,9 +18,9 @@ endif
+
+ ifeq ($(OS_ARCH), Linux)
+ ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS +=
-Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS +=
-Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' +
else
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
+ endif
+ endif
+
+--
+1.8.1.2
+
diff --git a/meta/recipes-support/nss/files/nss.pc.in
b/meta/recipes-support/nss/files/nss.pc.in new file mode 100644
index 000..200f635
--- /dev/null
+++ b/meta/recipes-support/nss/files/nss.pc.in
@@ -0,0 +1,11 @@
+prefix=OEPREFIX
+exec_prefix=OEEXECPREFIX
+libdir=OELIBDIR
+includedir=OEINCDIR
+
+Name: NSS
+Description: Network Security Services
+Version:
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
On Tuesday 09 July 2013 21:29:11 Hongxu Jia wrote:
1, 3.15.1 is the newest version, and file structure has more change than
previous version.
2, 3.13.3 just skip signing, and cheksum file doesn't be generated.
3, 3.13.3 doesn't completely fix incorrect shebang of perl (PATCH 5/5)
4, 3.13.3's package doesn't contain ${D}${bindir}/ and ${D}${sysconfdir}
I think 3.15.1 is better.
The reason I ask is that if merged this will effectively replace the one in
meta-browser, so as long as it handles everything that the meta-browser recipe
does it should be OK.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
On Jul 9, 2013, at 6:38 AM, Paul Eggleton paul.eggle...@linux.intel.com wrote:
On Tuesday 09 July 2013 21:29:11 Hongxu Jia wrote:
1, 3.15.1 is the newest version, and file structure has more change than
previous version.
2, 3.13.3 just skip signing, and cheksum file doesn't be generated.
3, 3.13.3 doesn't completely fix incorrect shebang of perl (PATCH 5/5)
4, 3.13.3's package doesn't contain ${D}${bindir}/ and ${D}${sysconfdir}
I think 3.15.1 is better.
The reason I ask is that if merged this will effectively replace the one in
meta-browser, so as long as it handles everything that the meta-browser
recipe
does it should be OK.
meta-browser has deleted the dependency on mss-native since the recipes needing
it meta-browser(chromium) got updated
and does not need it. So for meta-browser it doesn't matter anymore.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] nss: add version 3.15.1
Got it, I will check the one in meta-browser again to make sure everything
is handled, and resend the patch.
Thanks,
Hongxu
On 07/09/2013 09:38 PM, Paul Eggleton wrote:
On Tuesday 09 July 2013 21:29:11 Hongxu Jia wrote:
1, 3.15.1 is the newest version, and file structure has more change than
previous version.
2, 3.13.3 just skip signing, and cheksum file doesn't be generated.
3, 3.13.3 doesn't completely fix incorrect shebang of perl (PATCH 5/5)
4, 3.13.3's package doesn't contain ${D}${bindir}/ and ${D}${sysconfdir}
I think 3.15.1 is better.
The reason I ask is that if merged this will effectively replace the one in
meta-browser, so as long as it handles everything that the meta-browser recipe
does it should be OK.
Cheers,
Paul
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
