From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp685.redcondor.net (smtp685.redcondor.net [208.80.206.85]) by mail.openembedded.org (Postfix) with ESMTP id D57006A44D for ; Sat, 2 Aug 2014 10:38:58 +0000 (UTC) Received: from astoria.ccjclearline.com ([64.235.106.9]) by smtp685.redcondor.net ({20c8e40f-6b6c-4c9e-abff-1640ea7bf404}) via TCP (outbound) with ESMTPS id 20140802103858060 for ; Sat, 02 Aug 2014 10:38:58 +0000 X-RC-FROM: X-RC-RCPT: Received: from [99.240.204.5] (port=49795 helo=crashcourse.ca) by astoria.ccjclearline.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.80) (envelope-from ) id 1XDWiD-0001bn-AX for openembedded-core@lists.openembedded.org; Sat, 02 Aug 2014 06:38:53 -0400 Date: Sat, 2 Aug 2014 06:38:49 -0400 (EDT) From: "Robert P. J. Day" X-X-Sender: rpjday@localhost To: OE Core mailing list Message-ID: User-Agent: Alpine 2.11 (LFD 23 2013-08-11) MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - astoria.ccjclearline.com X-AntiAbuse: Original Domain - lists.openembedded.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - crashcourse.ca X-Source: X-Source-Args: X-Source-Dir: X-MAG-OUTBOUND: ccj.redcondor.net@64.235.106.9/32 Subject: [PATCH] nss*: Replace hardcoded "/etc" with "${sysconfdir}" X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Aug 2014 10:39:00 -0000 Content-Type: TEXT/PLAIN; charset=US-ASCII Signed-off-by: Robert P. J. Day --- 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*\//' \ -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 myhostname \3\4\5/' \ - -i $D/etc/nsswitch.conf + -i ${D}${sysconfdir}/nsswitch.conf } pkg_prerm_${PN} () { sed -e '/^hosts:/s/\s*\//' \ -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 ========================================================================