diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2014-02-26 15:49:16 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-28 14:01:11 +0000 |
| commit | 370b2d819648ea6dd963b1e6f22ef2d15e6f74ea (patch) | |
| tree | 413b0f61923837b2b9c37c57f07d983320289308 /meta/recipes-core/base-files | |
| parent | d9d6f01aa706796e45de3597676e65d1dd583342 (diff) | |
| download | openembedded-core-contrib-370b2d819648ea6dd963b1e6f22ef2d15e6f74ea.tar.gz | |
base-files: 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: 47d824657acc55e094d5703eed68853f2048c30c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/base-files')
| -rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 726e0d57ee..dbf40fa6dc 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -90,8 +90,8 @@ do_install () { install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd - sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile + sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc |