diff options
| author |   Robert P. J. Day <rpjday@crashcourse.ca> | 2014-08-02 06:38:49 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-06 10:03:21 +0100 |
| commit | aa87eade2bbb92f66894508384528600b4d6d2d0 (patch) | |
| tree | f91adf595da4a0295ad1fb89ac9a4fa102bbf8a5 /meta | |
| parent | ce7b1b07f76b90adc2aa0d9334a6866b3e80c0be (diff) | |
| download | openembedded-core-contrib-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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-support/nss/nss.inc | 6 |
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 } |