summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2014-08-02 06:38:49 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-06 10:02:39 +0100
commit1c44e057c66fe20d491fcb3ae45defe0a300b256 (patch)
tree3af5c858d57f113eeb8dcba92c4369fbd47ef65f
parent77b4d82687e7d65e8c6619c36d337b1d5763fc36 (diff)
downloadopenembedded-core-contrib-1c44e057c66fe20d491fcb3ae45defe0a300b256.tar.gz
openembedded-core-contrib-1c44e057c66fe20d491fcb3ae45defe0a300b256.tar.bz2
openembedded-core-contrib-1c44e057c66fe20d491fcb3ae45defe0a300b256.zip
nss*: Replace hardcoded "/etc" with "${sysconfdir}"
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb4
-rw-r--r--meta/recipes-support/nss/nss.inc6
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
index 540f22330a..d8ec863954 100644
--- a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
+++ b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
@@ -16,11 +16,11 @@ inherit autotools
pkg_postinst_${PN} () {
sed -e '/^hosts:/s/\s*\<myhostname\>//' \
-e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \
- -i $D/etc/nsswitch.conf
+ -i ${D}${sysconfdir}/nsswitch.conf
}
pkg_prerm_${PN} () {
sed -e '/^hosts:/s/\s*\<myhostname\>//' \
-e '/^hosts:/s/\s*myhostname//' \
- -i $D/etc/nsswitch.conf
+ -i ${D}${sysconfdir}/nsswitch.conf
}
diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
index ce7d4a4b27..69f98b58cd 100644
--- a/meta/recipes-support/nss/nss.inc
+++ b/meta/recipes-support/nss/nss.inc
@@ -169,10 +169,10 @@ do_install_append_class-target() {
sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc
# Create a blank certificate
- mkdir -p ${D}/etc/pki/nssdb/
+ mkdir -p ${D}${sysconfdir}/pki/nssdb/
touch ./empty_password
- certutil -N -d ${D}/etc/pki/nssdb/ -f ./empty_password
- chmod 644 ${D}/etc/pki/nssdb/*.db
+ certutil -N -d ${D}${sysconfdir}/pki/nssdb/ -f ./empty_password
+ chmod 644 ${D}${sysconfdir}/pki/nssdb/*.db
rm ./empty_password
}