From d2f5f2b0b129a654ae8b3ff3f048b582c93c385b Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 26 Feb 2014 15:49:52 +0200 Subject: systemd: 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 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] (From OE-Core rev: 8a60d490755c2c3010a87f2616008aee2c9cc966) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_208.bb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb index 219607f18f..1bcedaa28a 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* } -- cgit v1.2.3-54-g00ecf