[oe-commits] Saul Wold : base-files: sed installed file instead of original
git at git.openembedded.org
git at git.openembedded.org
Fri Feb 28 13:55:18 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 47d824657acc55e094d5703eed68853f2048c30c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=47d824657acc55e094d5703eed68853f2048c30c
Author: Saul Wold <sgw at linux.intel.com>
Date: Wed Feb 26 15:49:16 2014 +0200
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 <sgw at linux.intel.com>
---
meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 726e0d5..dbf40fa 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
More information about the Openembedded-commits
mailing list