summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-02-26 15:49:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-28 14:01:12 +0000
commit49cdb68e3bfa885e7eaf67aec97631413f53bdf3 (patch)
treef52aebdc1bbf393ac8eb71d3644106efed222348
parent370b2d819648ea6dd963b1e6f22ef2d15e6f74ea (diff)
downloadpoky-49cdb68e3bfa885e7eaf67aec97631413f53bdf3.tar.gz
poky-49cdb68e3bfa885e7eaf67aec97631413f53bdf3.tar.bz2
poky-49cdb68e3bfa885e7eaf67aec97631413f53bdf3.zip
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] (From OE-Core rev: 6007b955ce990e493a9dbf225290a9c7e133feee) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/base-passwd/base-passwd_3.5.29.bb2
1 files changed, 1 insertions, 1 deletions
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 0205f2e217..59bd413b49 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}