summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2014-02-13 11:48:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-13 11:41:22 +0000
commit01268c339f066381de1e129b0cb25a8199e9cc5c (patch)
treef5ddd61b6fbae4df6148627ddea8c72a1a79b628
parente0915485681d00528f94acdae036b23428e8ef15 (diff)
downloadpoky-01268c339f066381de1e129b0cb25a8199e9cc5c.tar.gz
nss: avoid to use the hardcode kernel version
Read kernel version from ${STAGING_KERNEL_DIR}/kernel-abiversion, to avoid to use the hardcode kernel version. (From OE-Core rev: 4c80c557508e088fe226bfa1834464b505404652) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/nss/nss.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
index a6aeed8b1a..3ad12cc057 100644
--- a/meta/recipes-support/nss/nss.inc
+++ b/meta/recipes-support/nss/nss.inc
@@ -23,7 +23,7 @@ SRC_URI_append_class-target = "\
23" 23"
24inherit siteinfo 24inherit siteinfo
25PR = "r0" 25PR = "r0"
26DEPENDS = "sqlite3 nspr zlib nss-native" 26DEPENDS = "sqlite3 nspr zlib nss-native virtual/kernel"
27DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" 27DEPENDS_class-native = "sqlite3-native nspr-native zlib-native"
28RDEPENDS_${PN} = "perl" 28RDEPENDS_${PN} = "perl"
29 29
@@ -55,7 +55,7 @@ do_compile() {
55 export NSS_USE_SYSTEM_SQLITE=1 55 export NSS_USE_SYSTEM_SQLITE=1
56 export NSS_ENABLE_ECC=1 56 export NSS_ENABLE_ECC=1
57 57
58 export OS_RELEASE=3.4 58 export OS_RELEASE=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion|sed 's/-.*//'`
59 export OS_TARGET=Linux 59 export OS_TARGET=Linux
60 export OS_ARCH=Linux 60 export OS_ARCH=Linux
61 61
@@ -95,7 +95,7 @@ do_install() {
95 export NSS_USE_SYSTEM_SQLITE=1 95 export NSS_USE_SYSTEM_SQLITE=1
96 export NSS_ENABLE_ECC=1 96 export NSS_ENABLE_ECC=1
97 97
98 export OS_RELEASE=3.4 98 export OS_RELEASE=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion|sed 's/-.*//'`
99 export OS_TARGET=Linux 99 export OS_TARGET=Linux
100 export OS_ARCH=Linux 100 export OS_ARCH=Linux
101 101