diff --git a/tests/ci/Makefile b/tests/ci/Makefile --- a/tests/ci/Makefile +++ b/tests/ci/Makefile @@ -20,8 +20,6 @@ WORLDDIR?= ${.CURDIR}/../.. RELEASEDIR= ${WORLDDIR}/release -MAKECONF?= /dev/null -SRCCONF?= /dev/null _MEMORY!=sysctl -n hw.physmem 2>/dev/null PARALLEL_JOBS!=sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null TOTAL_MEMORY!=expr ${_MEMORY} / 1073741824 @@ -129,10 +127,6 @@ .if ${VMGUEST} != "none" USE_QEMU?=1 .endif -KLDFILEMONISLOADED!=kldload -q -n filemon 2>/dev/null && echo "1" || echo "0" -.if ${KLDFILEMONISLOADED} == "1" -METAMODE?=-DWITH_META_MODE -.endif CLEANFILES+= ${.OBJDIR}/${CIIMAGE} ${.OBJDIR}/ci.img ${META_TAR} IMAGEDIR= ${.OBJDIR}/ci-buildimage @@ -168,16 +162,16 @@ ci-buildworld: .PHONY @echo "Building world for ${TARGET_ARCH}" - ${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \ - ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \ + ${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} \ + ${CROSS_TOOLCHAIN_PARAM} \ ${EXTRA_MAKE_FLAGS} buildworld > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \ (echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false) ci-buildkernel: ci-buildworld-${TARGET_ARCH:tl} .PHONY @echo "Building kernel for ${TARGET_ARCH}" - ${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \ - ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \ + ${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} \ + ${CROSS_TOOLCHAIN_PARAM} \ ${EXTRA_MAKE_FLAGS} KERNCONF=${KERNCONF} \ buildkernel > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \ (echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false)