On 27 November 2013 17:46, Khem Raj <[email protected]> wrote: > On Wednesday, November 27, 2013, Riku Voipio wrote: > > > nss has been added to OE-core, so an old copy in meta-browser > > is just confusing. > > > > > > Can you also report if there are any feature differences between these > recipes and one from oe-core ? >
A quick recap of differences: - nss in meta-browser skips signing libraries, while in oe-core lets user sign libraries on target device - nss in meta-browser makes staticdev (*.a) package - nss in meta-browser disables parallel make - nss in meta-oe enables lowhash support, meta-browser doesn't So the only thing lost would be staticdev package, which I don't think is being used anyway. Riku > > > > Signed-off-by: Riku Voipio <[email protected] <javascript:;>> > > --- > > recipes-support/nss/nss-3.13.3/native_cc.patch | 55 ---------- > > recipes-support/nss/nss-3.13.3/nss.pc.in | 11 -- > > recipes-support/nss/nss-3.13.3/skip_signing.patch | 18 ---- > > recipes-support/nss/nss_3.13.3.bb | 116 > > ---------------------- > > 4 files changed, 200 deletions(-) > > delete mode 100644 recipes-support/nss/nss-3.13.3/native_cc.patch > > delete mode 100644 recipes-support/nss/nss-3.13.3/nss.pc.in > > delete mode 100644 recipes-support/nss/nss-3.13.3/skip_signing.patch > > delete mode 100644 recipes-support/nss/nss_3.13.3.bb > > > > diff --git a/recipes-support/nss/nss-3.13.3/native_cc.patch > > b/recipes-support/nss/nss-3.13.3/native_cc.patch > > deleted file mode 100644 > > index 41d4980..0000000 > > --- a/recipes-support/nss/nss-3.13.3/native_cc.patch > > +++ /dev/null > > @@ -1,55 +0,0 @@ > > -we need to override ARCHFLAG as well since this is set to either -m32 or > > -m64 > > -and LDFLAGS add it explicitly which means when NATIVE_CC is defined then > > we build > > -the objects as 64bit but link them to be 32bit binary which may not fly > > - > > -Signed-off-by: Khem Raj <[email protected] <javascript:;>> > > -Index: mozilla/security/coreconf/mkdepend/Makefile > > -=================================================================== > > ---- mozilla.orig/security/coreconf/mkdepend/Makefile 2013-01-09 > > 13:23:51.747694602 -0800 > > -+++ mozilla/security/coreconf/mkdepend/Makefile 2013-01-09 > > 13:56:27.003734720 -0800 > > -@@ -64,11 +64,11 @@ > > - endif > > - > > - ifdef NATIVE_CC > > --CC=$(NATIVE_CC) > > -+override CC=$(NATIVE_CC) > > - endif > > - > > - ifdef NATIVE_FLAGS > > --OS_CFLAGS=$(NATIVE_FLAGS) > > -+override OS_CFLAGS=$(NATIVE_FLAGS) > > - endif > > - > > - include $(DEPTH)/coreconf/rules.mk > > -Index: mozilla/security/coreconf/nsinstall/Makefile > > -=================================================================== > > ---- mozilla.orig/security/coreconf/nsinstall/Makefile 2013-01-09 > > 13:23:51.747694602 -0800 > > -+++ mozilla/security/coreconf/nsinstall/Makefile 2013-01-09 > > 13:56:11.775734407 -0800 > > -@@ -58,11 +58,11 @@ > > - endif > > - > > - ifdef NATIVE_CC > > --CC=$(NATIVE_CC) > > -+override CC=$(NATIVE_CC) > > - endif > > - > > - ifdef NATIVE_FLAGS > > --OS_CFLAGS=$(NATIVE_FLAGS) > > -+override OS_CFLAGS=$(NATIVE_FLAGS) > > - endif > > - > > - include $(DEPTH)/coreconf/rules.mk > > -Index: mozilla/security/coreconf/Linux.mk > > -=================================================================== > > ---- mozilla.orig/security/coreconf/Linux.mk 2013-01-09 > > 13:50:01.427726808 -0800 > > -+++ mozilla/security/coreconf/Linux.mk 2013-01-09 13:55:58.815734141 > -0800 > > -@@ -98,6 +98,9 @@ > > - endif > > - endif > > - > > -+ifdef NATIVE_FLAGS > > -+ override ARCHFLAG= > > -+endif > > - > > - LIBC_TAG = _glibc > > - > > diff --git > a/recipes-support/nss/nss-3.13.3/nss.pc.inb/recipes-support/nss/nss-3.13.3/ > > nss.pc.in > > deleted file mode 100644 > > index abbc850..0000000 > > --- a/recipes-support/nss/nss-3.13.3/nss.pc.in > > +++ /dev/null > > @@ -1,11 +0,0 @@ > > -prefix=OEPREFIX > > -exec_prefix=OEEXECPREFIX > > -libdir=OELIBDIR > > -includedir=OEINCDIR > > - > > -Name: NSS > > -Description: Mozilla Network Security Services > > -Version: @VERSION@ > > -Requires: nspr > > -Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3 > > -Cflags: -I${includedir} -I${includedir}/mozilla/nss > > diff --git a/recipes-support/nss/nss-3.13.3/skip_signing.patch > > b/recipes-support/nss/nss-3.13.3/skip_signing.patch > > deleted file mode 100644 > > index 64e440d..0000000 > > --- a/recipes-support/nss/nss-3.13.3/skip_signing.patch > > +++ /dev/null > > @@ -1,18 +0,0 @@ > > -# HG changeset patch > > -# User Ted Mielczarek <[email protected] <javascript:;>> > > -# Date 1314190279 14400 > > -# Node ID a993dd883a502a15d0a8acebb7bf31fdbd0fd18f > > -# Parent 5a4a2b65e7b4950aa7cadc03aac43489ee314ba7 > > -[mq]: skip-shlibsigh > > - > > -diff --git a/security/nss/cmd/shlibsign/Makefile > > b/security/nss/cmd/shlibsign/Makefile > > ---- a/security/nss/cmd/shlibsign/Makefile > > -+++ b/security/nss/cmd/shlibsign/Makefile > > -@@ -120,5 +120,6 @@ > > - $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) > > - endif > > - > > -+ifndef SKIP_SHLIBSIGN > > - libs install :: $(CHECKLOC) > > -- > > -+endif > > diff --git a/recipes-support/nss/nss_3.13.3.bb b/recipes-support/nss/ > > nss_3.13.3.bb > > deleted file mode 100644 > > index ac77547..0000000 > > --- a/recipes-support/nss/nss_3.13.3.bb > > +++ /dev/null > > @@ -1,116 +0,0 @@ > > -DESCRIPTION = "Mozilla's SSL and TLS implementation" > > -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/"; > > - > > -PR = "r4" > > - > > -LICENSE = "MPL1.1 GPL LGPL" > > -LIC_FILES_CHKSUM = "file://security/nss/manifest.mn > > ;md5=d71978748f23eae3156c38ac2a691924" > > - > > -DEPENDS = "sqlite3 nspr nspr-native" > > - > > -SRC_URI = "\ > > - > > > http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/${PN}-${PV}.tar.gz\ > > - file://nss.pc.in \ > > - file://skip_signing.patch \ > > - file://native_cc.patch \ > > -" > > - > > -S = "${WORKDIR}/${P}/mozilla" > > - > > -SRC_URI[md5sum] = "006cb82fa900e9e664b4b14a9b7810ca" > > -SRC_URI[sha256sum] = > > "efa10f2c70da4bddabf1a6081964969bb23359b93d6eadbf4739274a77bc3587" > > - > > -TD = "${S}/tentative-dist" > > - > > -PARALLEL_MAKE = "" > > - > > -USE64BIT_x86-64 = "USE_64=1" > > -USE64BIT_mips64 = "USE_64=1" > > -USE64BIT_mips64el = "USE_64=1" > > -USE64BIT ?= "" > > - > > -do_compile() { > > -# sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = > > $(CORE_DEPTH)/dist:' -i ${S}/security/coreconf/source.mk > > - make -C security/nss \ > > - build_coreconf \ > > - build_dbm \ > > - export libs program \ > > - MOZILLA_CLIENT=1 \ > > - BUILD_OPT=1 \ > > - SKIP_SHLIBSIGN=1 \ > > - OS_TARGET="Linux" \ > > - OS_TARGET_RELEASE="2.6" \ > > - OS_TEST="${TARGET_ARCH}" \ > > - NSPR_INCLUDE_DIR="${STAGING_INCDIR}/mozilla/nspr" \ > > - NSPR_LIB_DIR="${STAGING_LIBDIR}" \ > > - SQLITE3_INCLUDE_DIR="${STAGING_INCDIR}" \ > > - OPTIMIZER="${CFLAGS}" \ > > - NS_USE_GCC=1 \ > > - NSS_USE_SYSTEM_SQLITE=1 \ > > - NSS_ENABLE_ECC=1 \ > > - DEFAULT_COMPILER="${TARGET_CC}" \ > > - CC="${CC}" \ > > - CCC="${CXX}" \ > > - CXX="${CXX}" \ > > - RANLIB="${RANLIB}" \ > > - NATIVE_CC="${BUILD_CC}" \ > > - NATIVE_FLAGS="${BUILD_CFLAGS}" \ > > - ${USE64BIT} > > -} > > - > > -do_install() { > > - make -C security/nss \ > > - install \ > > - MOZILLA_CLIENT=1 \ > > - BUILD_OPT=1 \ > > - SKIP_SHLIBSIGN=1 \ > > - OS_TARGET=Linux \ > > - OS_TARGET_RELEASE="2.6" \ > > - OS_TEST="${TARGET_ARCH}" \ > > - NSPR_INCLUDE_DIR="${STAGING_INCDIR}/mozilla/nspr" \ > > - NSPR_LIB_DIR="${STAGING_LIBDIR}" \ > > - NS_USE_GCC=1 \ > > - NSS_USE_SYSTEM_SQLITE=1 \ > > - NSS_ENABLE_ECC=1 \ > > - FREEBL_CHILD_BUILD=1 \ > > - CC="${CC}" \ > > - SOURCE_LIB_DIR="${TD}/${libdir}" \ > > - SOURCE_BIN_DIR="${TD}/${bindir}" \ > > - ${USE64BIT} > > - > > - install -d ${D}/${libdir} > > - > > - for shared_lib in ${TD}/${libdir}/*.so* > > - do > > -# oe_libinstall -C ${TD}/${libdir} `basename $shared_lib > > .so` ${D}/${libdir} > > - cp $shared_lib ${D}/${libdir} > > -# ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename > > $shared_lib .1oe) > > - done > > - > > - install -d ${D}/${includedir}/mozilla/nss > > - install -m 644 -t ${D}/${includedir}/mozilla/nss > > ${S}/dist/public/nss/* > > - > > - for static_lib in ${TD}/${libdir}/*.a > > - do > > - oe_libinstall -C ${TD}/${libdir} `basename $static_lib > .a` > > ${D}/${libdir} > > - done > > - > > - install -d ${D}/${bindir} > > - for binary in ${TD}/${bindir}/* > > - do > > - install -m 755 -t ${D}/${bindir} $binary > > - done > > - > > - install -D ${WORKDIR}/nss.pc.in ${D}${libdir}/pkgconfig/nss.pc > > - sed -i s:@VERSION@:${PV}:g ${D}${libdir}/pkgconfig/nss.pc > > - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc > > - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc > > - sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/nss.pc > > - sed -i s:OEEXECPREFIX:${exec_prefix}:g > > ${D}${libdir}/pkgconfig/nss.pc > > - > > - sed -i s:/usr/local/bin/perl:${bindir}/perl:g ${D}${bindir}/smime > > -} > > - > > -FILES_SOLIBSDEV := "" > > -FILES_${PN} += "${base_libdir}/lib*${SOLIBSDEV} > > ${libdir}/lib*${SOLIBSDEV}" > > -RDEPENDS_${PN} += "perl" > > -- > > 1.8.1.2 > > > > _______________________________________________ > > Openembedded-devel mailing list > > [email protected] <javascript:;> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
