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:03:21 +0100
commitaa87eade2bbb92f66894508384528600b4d6d2d0 (patch)
treef91adf595da4a0295ad1fb89ac9a4fa102bbf8a5
parentce7b1b07f76b90adc2aa0d9334a6866b3e80c0be (diff)
downloadpoky-aa87eade2bbb92f66894508384528600b4d6d2d0.tar.gz
nss*: Replace hardcoded "/etc" with "${sysconfdir}"
(From OE-Core rev: 1c44e057c66fe20d491fcb3ae45defe0a300b256) 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
16pkg_postinst_${PN} () { 16pkg_postinst_${PN} () {
17 sed -e '/^hosts:/s/\s*\<myhostname\>//' \ 17 sed -e '/^hosts:/s/\s*\<myhostname\>//' \
18 -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \ 18 -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \
19 -i $D/etc/nsswitch.conf 19 -i ${D}${sysconfdir}/nsswitch.conf
20} 20}
21 21
22pkg_prerm_${PN} () { 22pkg_prerm_${PN} () {
23 sed -e '/^hosts:/s/\s*\<myhostname\>//' \ 23 sed -e '/^hosts:/s/\s*\<myhostname\>//' \
24 -e '/^hosts:/s/\s*myhostname//' \ 24 -e '/^hosts:/s/\s*myhostname//' \
25 -i $D/etc/nsswitch.conf 25 -i ${D}${sysconfdir}/nsswitch.conf
26} 26}
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() {
169 sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc 169 sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc
170 170
171 # Create a blank certificate 171 # Create a blank certificate
172 mkdir -p ${D}/etc/pki/nssdb/ 172 mkdir -p ${D}${sysconfdir}/pki/nssdb/
173 touch ./empty_password 173 touch ./empty_password
174 certutil -N -d ${D}/etc/pki/nssdb/ -f ./empty_password 174 certutil -N -d ${D}${sysconfdir}/pki/nssdb/ -f ./empty_password
175 chmod 644 ${D}/etc/pki/nssdb/*.db 175 chmod 644 ${D}${sysconfdir}/pki/nssdb/*.db
176 rm ./empty_password 176 rm ./empty_password
177} 177}
178 178