Patchwork nss-myhostname: fix postinst/prerm scripts

login
register
mail settings
Submitter Koen Kooi
Date Aug. 20, 2014, 1:28 p.m.
Message ID <1408541330-3969-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/78683/
State Accepted
Commit 7b0137c823931a236583b509a3ee5fdc0e957387
Headers show

Comments

Koen Kooi - Aug. 20, 2014, 1:28 p.m.
${D} is expanded by bitbake which means the postinst looks like this:

sed -e '/^hosts:/s/\s*\<myhostname\>//' \
    -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \
    -i /build/scratch/angstrom-v2014.12/build/tmp-angstrom_next-eglibc/work/armv5te-angstrom-linux-gnueabi/systemd/1_216+gitAUTOINC+5d0ae62c66-r0/image/etc/nsswitch.conf

Change ${D} to $D to stop it from being expanded by bitbake.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

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 d8ec863..1237602 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}${sysconfdir}/nsswitch.conf
+		-i $D${sysconfdir}/nsswitch.conf
 }
 
 pkg_prerm_${PN} () {
 	sed -e '/^hosts:/s/\s*\<myhostname\>//' \
 		-e '/^hosts:/s/\s*myhostname//' \
-		-i ${D}${sysconfdir}/nsswitch.conf
+		-i $D${sysconfdir}/nsswitch.conf
 }