From 916158a379a71062daa42606a87d5e04659ec157 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 28 Sep 2020 13:01:37 +0100 Subject: [PATCH] minifi-cpp: Adapt to potential psuedo changes If we do adopt path filtering for pseudo, we may filter out ${B} as not needing to be tracked for "root" permissions. We do need to track the data installed by do_install though, so move the temp directory this recipe uses out of ${B} and place it in WORKDIR. Signed-off-by: Richard Purdie Signed-off-by: Khem Raj --- meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 926dd755b6..5127e11d81 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -66,10 +66,10 @@ TARGET_CXXFLAGS_append_riscv32 += "-fpic" TARGET_CFLAGS_append_riscv64 += "-fpic" TARGET_CXXFLAGS_append_riscv64 += "-fpic" +do_install[cleandirs] += "${WORKDIR}/minifi-install" do_install() { - DESTDIR='${B}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} - + DESTDIR='${WORKDIR}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} MINIFI_BIN=${bindir} MINIFI_HOME=${sysconfdir}/minifi MINIFI_RUN=${localstatedir}/lib/minifi @@ -78,8 +78,8 @@ do_install() { install -d ${D}${MINIFI_BIN} install -d ${D}${MINIFI_HOME}/conf install -m 755 -d ${D}${localstatedir}/lib/minifi - cp -a ${B}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ - cp -a ${B}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ + cp -a ${WORKDIR}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ + cp -a ${WORKDIR}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ sed -i 's|#appender.rolling.directory=.*|appender.rolling.directory='${MINIFI_LOG}'|g' \ ${D}${MINIFI_HOME}/conf/minifi-log.properties