diff options
-rw-r--r-- | meta-oe/recipes-support/nss/nss/signlibs.sh | 20 | ||||
-rw-r--r-- | meta-oe/recipes-support/nss/nss_3.56.bb | 6 |
2 files changed, 0 insertions, 26 deletions
diff --git a/meta-oe/recipes-support/nss/nss/signlibs.sh b/meta-oe/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499f8c..0000000000 --- a/meta-oe/recipes-support/nss/nss/signlibs.sh +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # signlibs.sh | ||
4 | # | ||
5 | # (c)2010 Wind River Systems, Inc. | ||
6 | # | ||
7 | # regenerates the .chk files for the NSS libraries that require it | ||
8 | # since the ones that are built have incorrect checksums that were | ||
9 | # calculated on the host where they really need to be done on the | ||
10 | # target | ||
11 | |||
12 | CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` | ||
13 | SIGN_BINARY=`which shlibsign` | ||
14 | for I in $CHK_FILES | ||
15 | do | ||
16 | DN=`dirname $I` | ||
17 | BN=`basename $I .chk` | ||
18 | FN=$DN/$BN.so | ||
19 | $SIGN_BINARY -i $FN | ||
20 | done | ||
diff --git a/meta-oe/recipes-support/nss/nss_3.56.bb b/meta-oe/recipes-support/nss/nss_3.56.bb index 107b0a0152..997f8950fd 100644 --- a/meta-oe/recipes-support/nss/nss_3.56.bb +++ b/meta-oe/recipes-support/nss/nss_3.56.bb | |||
@@ -21,7 +21,6 @@ VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + ' | |||
21 | 21 | ||
22 | SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ | 22 | SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ |
23 | file://nss.pc.in \ | 23 | file://nss.pc.in \ |
24 | file://signlibs.sh \ | ||
25 | file://0001-nss-fix-support-cross-compiling.patch \ | 24 | file://0001-nss-fix-support-cross-compiling.patch \ |
26 | file://nss-no-rpath-for-cross-compiling.patch \ | 25 | file://nss-no-rpath-for-cross-compiling.patch \ |
27 | file://nss-fix-incorrect-shebang-of-perl.patch \ | 26 | file://nss-fix-incorrect-shebang-of-perl.patch \ |
@@ -214,7 +213,6 @@ do_install_append() { | |||
214 | touch ${D}/${libdir}/$file | 213 | touch ${D}/${libdir}/$file |
215 | chmod 755 ${D}/${libdir}/$file | 214 | chmod 755 ${D}/${libdir}/$file |
216 | done | 215 | done |
217 | install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh | ||
218 | 216 | ||
219 | install -d ${D}${libdir}/pkgconfig/ | 217 | install -d ${D}${libdir}/pkgconfig/ |
220 | sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc | 218 | sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc |
@@ -251,10 +249,6 @@ pkg_postinst_${PN} () { | |||
251 | done | 249 | done |
252 | } | 250 | } |
253 | 251 | ||
254 | pkg_postinst_ontarget_${PN} () { | ||
255 | ${bindir}/signlibs.sh | ||
256 | } | ||
257 | |||
258 | PACKAGES =+ "${PN}-smime" | 252 | PACKAGES =+ "${PN}-smime" |
259 | FILES_${PN}-smime = "\ | 253 | FILES_${PN}-smime = "\ |
260 | ${bindir}/smime \ | 254 | ${bindir}/smime \ |