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>

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 540f22330af2af20c455a7202b88f67266b71ccb..d8ec863954170abc403344e639b6267c2c742239 100644 (file)
--- 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 ce7d4a4b274eceeb6b48f31e61e044fb338bcb08..69f98b58cd3795b284a73da0f7780feacfa86ced 100644 (file)
--- 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
 }