Skip to content

Commit a7aaf60

Browse files
svmhdvnsvmhdvn
committed
tests/ci: combine buildworld, buildkernel, and packages
Since its inception, 'make ci' has not found a need for any arch specific or build-type specific overrides for building the world and kernel as part of building an image. This change combines them to avoid multiple invocations of make, which could cause issues due to differences in command line between the three targets. This also simplifies the common and arch-specific Makefiles. Note that this change still maintains an arch-specific overridable target ci-buildimage-${TARGET_ARCH} which can be used if needed. Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
1 parent 167f3be commit a7aaf60

File tree

7 files changed

+3
-40
lines changed

7 files changed

+3
-40
lines changed

‎tests/ci/Makefile‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -177,25 +177,12 @@ clean: beforeclean .PHONY
177177

178178
cleandir: beforeclean .PHONY
179179

180-
ci-buildworld: ci-checktarget .PHONY
181-
@echo "Building world for ${TARGET_ARCH}"
182-
${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \
183-
${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \
184-
${EXTRA_MAKE_FLAGS} buildworld ${LOG_TARGET}
185-
186-
ci-buildkernel: ci-buildworld-${TARGET_ARCH:tl} .PHONY
187-
@echo "Building kernel for ${TARGET_ARCH}"
188-
${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \
189-
${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \
190-
${EXTRA_MAKE_FLAGS} KERNCONF=${KERNCONF} \
191-
buildkernel ${LOG_TARGET}
192-
193-
ci-buildpkgbase: ci-buildkernel-${TARGET_ARCH:tl} .PHONY
194-
@echo "Building pkgbase for ${TARGET_ARCH}"
180+
ci-buildpkgbase: .PHONY
181+
@echo "Building world, kernel, and pkgbase for ${TARGET_ARCH}"
195182
${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \
196183
${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \
197184
${EXTRA_MAKE_FLAGS} KERNCONF=${KERNCONF} REPODIR=${PKGBASE_REPO} \
198-
update-packages ${LOG_TARGET}
185+
buildworld buildkernel update-packages ${LOG_TARGET}
199186
mkdir -p ${PKGBASE_REPO_DIR}
200187
@printf "FreeBSD-base: { url: "file://%s", enabled: yes }" \
201188
${PKGBASE_REPO}/${PKG_ABI}/latest \

‎tests/ci/Makefile.aarch64‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ QEMU_MAX_MEM_SIZE=64
1515

1616
# NOTE: Nothing should be changed below this line unless explicitly required.
1717

18-
ci-buildworld-aarch64: ci-buildworld .PHONY
19-
20-
ci-buildkernel-aarch64: ci-buildkernel .PHONY
21-
2218
ci-buildimage-aarch64: ci-buildimage .PHONY
2319

2420
.if ${MACHINE} == "arm64" && ( !defined(USE_QEMU) || empty(USE_QEMU) )

‎tests/ci/Makefile.amd64‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ portinstall-amd64: portinstall-pkg .PHONY
1717

1818
# NOTE: Nothing should be changed below this line unless explicitly required.
1919

20-
ci-buildworld-amd64: ci-buildworld .PHONY
21-
22-
ci-buildkernel-amd64: ci-buildkernel .PHONY
23-
2420
ci-buildimage-amd64: ci-buildimage .PHONY
2521

2622
.if ${MACHINE} == "amd64" && ( !defined(USE_QEMU) || empty(USE_QEMU) )

‎tests/ci/Makefile.armv7‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ portinstall-armv7: portinstall-pkg .PHONY
2020

2121
# NOTE: Nothing should be changed below this line unless explicitly required.
2222

23-
ci-buildworld-armv7: ci-buildworld .PHONY
24-
25-
ci-buildkernel-armv7: ci-buildkernel .PHONY
26-
2723
ci-buildimage-armv7: ci-buildimage .PHONY
2824

2925
ci-runtest-armv7: ci-runtest-qemu .PHONY

‎tests/ci/Makefile.powerpc64‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ portinstall-powerpc64: portinstall-pkg .PHONY
1818

1919
# NOTE: Nothing should be changed below this line unless explicitly required.
2020

21-
ci-buildworld-powerpc64: ci-buildworld .PHONY
22-
23-
ci-buildkernel-powerpc64: ci-buildkernel .PHONY
24-
2521
ci-buildimage-powerpc64: ci-buildimage .PHONY
2622

2723
ci-runtest-powerpc64: ci-runtest-qemu .PHONY

‎tests/ci/Makefile.powerpc64le‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ portinstall-powerpc64le: portinstall-pkg .PHONY
1818

1919
# NOTE: Nothing should be changed below this line unless explicitly required.
2020

21-
ci-buildworld-powerpc64le: ci-buildworld .PHONY
22-
23-
ci-buildkernel-powerpc64le: ci-buildkernel .PHONY
24-
2521
ci-buildimage-powerpc64le: ci-buildimage .PHONY
2622

2723
ci-runtest-powerpc64le: ci-runtest-qemu .PHONY

‎tests/ci/Makefile.riscv64‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ portinstall-riscv64: portinstall-pkg .PHONY
2222

2323
# NOTE: Nothing should be changed below this line unless explicitly required.
2424

25-
ci-buildworld-riscv64: ci-buildworld .PHONY
26-
27-
ci-buildkernel-riscv64: ci-buildkernel .PHONY
28-
2925
ci-buildimage-riscv64: ci-buildimage .PHONY
3026

3127
ci-runtest-riscv64: ci-runtest-qemu .PHONY

0 commit comments

Comments
 (0)