diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-13 12:04:51 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-13 12:06:01 +0000 |
commit | abf22bed20870e6283853674a51a39f44af93936 (patch) | |
tree | 5c14514eb71e8580ee64a436a7883b3e925d5a5a /meta/recipes-support/nss | |
parent | 937a12ddb8693f31a7dd96600172d7c86df4f9b1 (diff) | |
download | poky-abf22bed20870e6283853674a51a39f44af93936.tar.gz |
Revert "nss: avoid to use the hardcode kernel version"
This reverts commit 4c80c557508e088fe226bfa1834464b505404652.
We *cannot* have nss becoming machine specific, that makes no sense.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nss')
-rw-r--r-- | meta/recipes-support/nss/nss.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc index 3ad12cc057..a6aeed8b1a 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 | " |
24 | inherit siteinfo | 24 | inherit siteinfo |
25 | PR = "r0" | 25 | PR = "r0" |
26 | DEPENDS = "sqlite3 nspr zlib nss-native virtual/kernel" | 26 | DEPENDS = "sqlite3 nspr zlib nss-native" |
27 | DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" | 27 | DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" |
28 | RDEPENDS_${PN} = "perl" | 28 | RDEPENDS_${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=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion|sed 's/-.*//'` | 58 | export OS_RELEASE=3.4 |
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=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion|sed 's/-.*//'` | 98 | export OS_RELEASE=3.4 |
99 | export OS_TARGET=Linux | 99 | export OS_TARGET=Linux |
100 | export OS_ARCH=Linux | 100 | export OS_ARCH=Linux |
101 | 101 | ||