[oe-commits] Saul Wold : base-passwd: sed installed file instead of original

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 6007b955ce990e493a9dbf225290a9c7e133feee
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6007b955ce990e493a9dbf225290a9c7e133feee

Author: Saul Wold <sgw at linux.intel.com>
Date:   Wed Feb 26 15:49:29 2014 +0200

base-passwd: sed installed file instead of original

When we change the ROOT_HOME the sed regex does not match if we are running
the do_install() a second time, so sed the installed file and preserve the original
so that the sed regex is matched correctly in the original

[YOCTO #5765]

Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
index 0205f2e..59bd413 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
@@ -28,8 +28,8 @@ do_install () {
 		${D}${mandir}/pl/man8/update-passwd.8
 	gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/*
 	install -d -m 755 ${D}${datadir}/base-passwd
-	sed -i 's#:/root:#:${ROOT_HOME}:#' ${S}/passwd.master
 	install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/
+	sed -i 's#:/root:#:${ROOT_HOME}:#' ${D}${datadir}/base-passwd/passwd.master
 	install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/
 
 	install -d -m 755 ${D}${docdir}/${BPN}