qemu build variant

This commit is contained in:
Ciro Santilli
2018-08-05 09:14:30 +01:00
parent 22dda8f6db
commit 2e42a776c5
3 changed files with 28 additions and 11 deletions

32
build
View File

@@ -21,7 +21,7 @@ post_script_args=
qemu_sdl='--enable-sdl --with-sdlabi=2.0' qemu_sdl='--enable-sdl --with-sdlabi=2.0'
suffix= suffix=
v=0 v=0
while getopts 'a:B:b:C:c:fGgj:hIiK:kL:lM:p:qSst::v' OPT; do while getopts 'a:B:b:C:c:fGgj:hIiK:kL:lM:p:Q:qSst::v' OPT; do
case "$OPT" in case "$OPT" in
a) a)
arch="$OPTARG" arch="$OPTARG"
@@ -88,6 +88,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=n
p) p)
post_script_args="$OPTARG" post_script_args="$OPTARG"
;; ;;
Q)
common_qemu_variant="$OPTARG"
;;
q) q)
extra_make_args="${extra_make_args} host-qemu-reconfigure \\ extra_make_args="${extra_make_args} host-qemu-reconfigure \\
" "
@@ -191,15 +194,24 @@ echo
common_mkdir common_mkdir
# Manage Linux kernel variants. # Manage Linux kernel and QEMU variants.
if [ -h "$common_linux_custom_dir" ]; then symlink_buildroot_variant() (
rm "$common_linux_custom_dir" custom_dir="$1"
elif [ -d "$common_linux_custom_dir" ]; then variant_dir="$2"
# Migration for existing builds. if [ -h "$custom_dir" ]; then
mv "$common_linux_custom_dir" "$common_linux_variant_dir" rm "$custom_dir"
fi elif [ -d "$custom_dir" ]; then
mkdir -p "$common_linux_variant_dir" # Migration for existing builds.
ln -s "$common_linux_variant_dir" "$common_linux_custom_dir" mv "$custom_dir" "$variant_dir"
fi
mkdir -p "$variant_dir"
ln -s "$variant_dir" "$custom_dir"
)
symlink_buildroot_variant "$common_linux_custom_dir" "$common_linux_variant_dir"
symlink_buildroot_variant "$common_qemu_custom_dir" "$common_qemu_variant_dir"
# TODO: this breaks the build. But then I noticed that it wouldn't make sense,
# because this is a guest tool, and we don't have image variants yet. Some other day maybe.
#symlink_buildroot_variant "$common_qemu_guest_custom_dir" "$common_qemu_guest_variant_dir"
# Manage gem5 variants. # Manage gem5 variants.
if "$gem5"; then if "$gem5"; then

5
common
View File

@@ -72,6 +72,10 @@ set_common_vars() {
common_qemu_termout_file="${common_qemu_run_dir}/termout.txt" common_qemu_termout_file="${common_qemu_run_dir}/termout.txt"
common_linux_custom_dir="${build_dir}/linux-custom" common_linux_custom_dir="${build_dir}/linux-custom"
common_linux_variant_dir="${common_linux_custom_dir}.${linux_variant}" common_linux_variant_dir="${common_linux_custom_dir}.${linux_variant}"
common_qemu_custom_dir="${build_dir}/host-qemu-custom"
common_qemu_variant_dir="${common_qemu_custom_dir}.${common_qemu_variant}"
common_qemu_guest_custom_dir="${build_dir}/qemu-custom"
common_qemu_guest_variant_dir="${common_qemu_custom_dir}.${common_qemu_variant}"
common_vmlinux="${common_linux_variant_dir}/vmlinux" common_vmlinux="${common_linux_variant_dir}/vmlinux"
if [ -n "$common_gem5_worktree" ]; then if [ -n "$common_gem5_worktree" ]; then
common_gem5_src_dir="${common_gem5_non_default_src_root_dir}/${common_gem5_worktree}" common_gem5_src_dir="${common_gem5_non_default_src_root_dir}/${common_gem5_worktree}"
@@ -133,6 +137,7 @@ common_mkdir() (
; ;
) )
common_linux_variant=default common_linux_variant=default
common_qemu_variant=default
root_dir="$(pwd)" root_dir="$(pwd)"
out_dir="${root_dir}/out" out_dir="${root_dir}/out"
common_bench_boot="${out_dir}/bench-boot.txt" common_bench_boot="${out_dir}/bench-boot.txt"

2
qemu

Submodule qemu updated: 68f40a7074...f750236039