* [PATCH] nss*: Replace hardcoded "/etc" with "${sysconfdir}"
@ 2014-08-02 10:38 Robert P. J. Day
0 siblings, 0 replies; only message in thread
From: Robert P. J. Day @ 2014-08-02 10:38 UTC (permalink / raw)
To: OE Core mailing list
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
---
not build-tested, but bitbake parse tested, seemed pretty straight
forward.
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 540f223..d8ec863 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 ce7d4a4..69f98b5 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
}
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-08-02 10:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-02 10:38 [PATCH] nss*: Replace hardcoded "/etc" with "${sysconfdir}" Robert P. J. Day
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.