[oe-commits] Richard Purdie : Revert "nss: avoid to use the hardcode kernel version"

git at git.openembedded.org git at git.openembedded.org
Mon Feb 17 16:57:56 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: c6824a54c11f9a45720b2628ccba972653a0559a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c6824a54c11f9a45720b2628ccba972653a0559a

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Feb 13 12:04:51 2014 +0000

Revert "nss: avoid to use the hardcode kernel version"

This reverts commit 4c80c557508e088fe226bfa1834464b505404652.

We *cannot* have nss becoming machine specific, that makes no sense.

---

 meta/recipes-support/nss/nss.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
index 3ad12cc..a6aeed8 100644
--- a/meta/recipes-support/nss/nss.inc
+++ b/meta/recipes-support/nss/nss.inc
@@ -23,7 +23,7 @@ SRC_URI_append_class-target = "\
 "
 inherit siteinfo
 PR = "r0"
-DEPENDS = "sqlite3 nspr zlib nss-native virtual/kernel"
+DEPENDS = "sqlite3 nspr zlib nss-native"
 DEPENDS_class-native = "sqlite3-native nspr-native zlib-native"
 RDEPENDS_${PN} = "perl"
 
@@ -55,7 +55,7 @@ do_compile() {
     export NSS_USE_SYSTEM_SQLITE=1
     export NSS_ENABLE_ECC=1
 
-    export OS_RELEASE=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion|sed 's/-.*//'`
+    export OS_RELEASE=3.4
     export OS_TARGET=Linux
     export OS_ARCH=Linux
 
@@ -95,7 +95,7 @@ do_install() {
     export NSS_USE_SYSTEM_SQLITE=1
     export NSS_ENABLE_ECC=1
 
-    export OS_RELEASE=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion|sed 's/-.*//'`
+    export OS_RELEASE=3.4
     export OS_TARGET=Linux
     export OS_ARCH=Linux
 



More information about the Openembedded-commits mailing list