When we change the ROOT_HOME the sed regex does not match if we are running
the do_install() a second time, so copy the units files first to a pre_sed,
so that the next time, we can copy the the original so that the sed regex
is matched correctly in the original

[YOCTO #5765]

Signed-off-by: Saul Wold <[email protected]>
---
 meta/recipes-core/systemd/systemd_208.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-core/systemd/systemd_208.bb 
b/meta/recipes-core/systemd/systemd_208.bb
index 219607f..1bcedaa 100644
--- a/meta/recipes-core/systemd/systemd_208.bb
+++ b/meta/recipes-core/systemd/systemd_208.bb
@@ -89,6 +89,11 @@ EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
 do_configure_prepend() {
        export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}"
        export KMOD="${base_bindir}/kmod"
+       if [ -d ${S}/units.pre_sed ] ; then
+               cp -r ${S}/units.pre_sed ${S}/units
+       else
+               cp -r ${S}/units ${S}/units.pre_sed
+       fi
        sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
 }
 
-- 
1.8.3.1

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to