From: Saul Wold Date: Wed, 26 Feb 2014 13:49:16 +0000 (+0200) Subject: base-files: sed installed file instead of original X-Git-Tag: 2015-4~3535 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=47d824657acc55e094d5703eed68853f2048c30c;p=openembedded-core.git 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] Signed-off-by: Saul Wold --- 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