D24276.id70168.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D24276.id70168.diff
View Options

	Index: tools/boot/ci-qemu-test.sh
	===================================================================
	--- tools/boot/ci-qemu-test.sh
	+++ tools/boot/ci-qemu-test.sh
	@@ -33,24 +33,15 @@
	done

	# Install kernel, loader and minimal userland.
	-
	- make -DNO_ROOT DESTDIR=${ROOTDIR} \
	- MODULES_OVERRIDE= \
	- WITHOUT_DEBUG_FILES=yes \
	- WITHOUT_KERNEL_SYMBOLS=yes \
	- installkernel
	- for dir in stand \
	- lib/libc lib/libedit lib/ncurses \
	- libexec/rtld-elf \
	- bin/sh sbin/init sbin/shutdown sbin/sysctl; do
	- make -DNO_ROOT DESTDIR=${ROOTDIR} INSTALL="install -U" \
	- WITHOUT_DEBUG_FILES= \
	- WITHOUT_MAN= \
	- WITHOUT_PROFILE= \
	- WITHOUT_TESTS= \
	- WITHOUT_TOOLCHAIN= \
	- -C ${dir} install
	- done
	+ cat<<EOF >${ROOTDIR}/pkg.conf
	+REPOS_DIR=[]
	+repositories={local {url = file://$(dirname $OBJTOP)/repo/\${ABI}/latest}}
	+EOF
	+ ASSUME_ALWAYS_YES=true INSTALL_AS_USER=true pkg \
	+ -o ABI_FILE=$OBJTOP/bin/sh/sh \
	+ -C ${ROOTDIR}/pkg.conf -r ${ROOTDIR} install \
	+ FreeBSD-kernel-generic FreeBSD-bootloader \
	+ FreeBSD-clibs FreeBSD-runtime

	# Put loader in standard EFI location.
	mv ${ROOTDIR}/boot/loader.efi ${ROOTDIR}/efi/boot/BOOTx64.EFI
	@@ -81,6 +72,10 @@
	if [ -z "${SRCTOP}" ]; then
	die "Cannot locate top of source tree"
	fi
	+: ${OBJTOP:=$(make -V OBJTOP)}
	+if [ -z "${OBJTOP}" ]; then
	+ die "Cannot locate top of object tree"
	+fi

	# Locate the uefi firmware file used by qemu.
	: ${OVMF:=/usr/local/share/uefi-edk2-qemu/QEMU_UEFI_CODE-x86_64.fd}