diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-02-26 15:49:29 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-28 14:01:12 +0000 |
commit | 49cdb68e3bfa885e7eaf67aec97631413f53bdf3 (patch) | |
tree | f52aebdc1bbf393ac8eb71d3644106efed222348 /meta/recipes-core | |
parent | 370b2d819648ea6dd963b1e6f22ef2d15e6f74ea (diff) | |
download | poky-49cdb68e3bfa885e7eaf67aec97631413f53bdf3.tar.gz |
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 2 |
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 () { | |||
28 | ${D}${mandir}/pl/man8/update-passwd.8 | 28 | ${D}${mandir}/pl/man8/update-passwd.8 |
29 | gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/* | 29 | gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/* |
30 | install -d -m 755 ${D}${datadir}/base-passwd | 30 | install -d -m 755 ${D}${datadir}/base-passwd |
31 | sed -i 's#:/root:#:${ROOT_HOME}:#' ${S}/passwd.master | ||
32 | install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/ | 31 | install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/ |
32 | sed -i 's#:/root:#:${ROOT_HOME}:#' ${D}${datadir}/base-passwd/passwd.master | ||
33 | install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/ | 33 | install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/ |
34 | 34 | ||
35 | install -d -m 755 ${D}${docdir}/${BPN} | 35 | install -d -m 755 ${D}${docdir}/${BPN} |