Don't compile qemu when gem5 is used

This commit is contained in:
Ciro Santilli
2018-02-21 13:24:20 +00:00
parent 9e5173f324
commit f31046d26a
4 changed files with 12 additions and 10 deletions

3
build
View File

@@ -94,6 +94,9 @@ fi
if $x11; then if $x11; then
cat ../buildroot_config_fragment_x11 >> "${outdir}/.config" cat ../buildroot_config_fragment_x11 >> "${outdir}/.config"
fi fi
if ! "$gem5"; then
cat ../buildroot_config_fragment_qemu >> "${outdir}/.config"
fi
if [ "$arch" = 'mips64' ]; then if [ "$arch" = 'mips64' ]; then
# Workaround for: # Workaround for:
# http://lists.busybox.net/pipermail/buildroot/2017-August/201053.html # http://lists.busybox.net/pipermail/buildroot/2017-August/201053.html

View File

@@ -27,14 +27,6 @@ BR2_OPTIMIZE_0=y
BR2_PACKAGE_GDB=y BR2_PACKAGE_GDB=y
BR2_PTHREAD_DEBUG=y BR2_PTHREAD_DEBUG=y
# QEMU
BR2_PACKAGE_HOST_QEMU=y
# False because otherwise we need the host to be as recent as guest, and the build fails with:
# package/qemu/qemu.mk:110: *** "Refusing to build qemu-user: target Linux version newer than host's.". Stop.
BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE=n
BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y
BR2_PACKAGE_HOST_QEMU_VDE2=y
# ftrace # ftrace
BR2_PACKAGE_TRACE_CMD=y BR2_PACKAGE_TRACE_CMD=y

View File

@@ -0,0 +1,6 @@
BR2_PACKAGE_HOST_QEMU=y
# False because otherwise we need the host to be as recent as guest, and the build fails with:
# package/qemu/qemu.mk:110: *** "Refusing to build qemu-user: target Linux version newer than host's.". Stop.
BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE=n
BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y
BR2_PACKAGE_HOST_QEMU_VDE2=y

View File

@@ -2,6 +2,7 @@
images_dir="$1" images_dir="$1"
cd "$images_dir" cd "$images_dir"
f=rootfs.ext2 f=rootfs.ext2
if [ -f "$f" ]; then exe="${HOST_DIR}/bin/qemu-img"
"${HOST_DIR}/bin/qemu-img" convert -f raw -O qcow2 "$f" "${f}.qcow2" if [ -f "$exe" ] && [ -f "$f" ]; then
"$exe" convert -f raw -O qcow2 "$f" "${f}.qcow2"
fi fi