helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-10-01 21:24:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

minifi-cpp: Adapt to potential psuedo changes

Browse Source 
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 <richard.purdie@linuxfoundation.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Richard Purdie 2020-09-28 13:01:37 +01:00 committed by Khem Raj
parent a8bc9fb94f
commit 916158a379
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
View File

@ -66,10 +66,10 @@ TARGET_CXXFLAGS_append_riscv32 += "-fpic"
TARGET_CFLAGS_append_riscv64 += "-fpic" TARGET_CFLAGS_append_riscv64 += "-fpic"
TARGET_CXXFLAGS_append_riscv64 += "-fpic" TARGET_CXXFLAGS_append_riscv64 += "-fpic"
do_install[cleandirs] += "${WORKDIR}/minifi-install"
do_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_BIN=${bindir}
MINIFI_HOME=${sysconfdir}/minifi MINIFI_HOME=${sysconfdir}/minifi
MINIFI_RUN=${localstatedir}/lib/minifi MINIFI_RUN=${localstatedir}/lib/minifi
@ -78,8 +78,8 @@ do_install() {
install -d ${D}${MINIFI_BIN} install -d ${D}${MINIFI_BIN}
install -d ${D}${MINIFI_HOME}/conf install -d ${D}${MINIFI_HOME}/conf
install -m 755 -d ${D}${localstatedir}/lib/minifi install -m 755 -d ${D}${localstatedir}/lib/minifi
cp -a ${B}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ cp -a ${WORKDIR}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/
cp -a ${B}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ cp -a ${WORKDIR}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/
sed -i 's|#appender.rolling.directory=.*|appender.rolling.directory='${MINIFI_LOG}'|g' \ sed -i 's|#appender.rolling.directory=.*|appender.rolling.directory='${MINIFI_LOG}'|g' \
${D}${MINIFI_HOME}/conf/minifi-log.properties ${D}${MINIFI_HOME}/conf/minifi-log.properties