Skip to content

Commit

Permalink
run_qemu: add a manual depmod step after {nfit,cxl}_test setup
Browse files Browse the repository at this point in the history
The {nfit,cxl}_test depmod config files are only effective after a
subsequent depmod run. Perform a manual depmod after setting up the
config files so that the extra overrides happen reliably.

Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
  • Loading branch information
stellarhopper committed Oct 6, 2021
1 parent 4ccb5be commit 2ed0ed3
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion run_qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,11 @@ setup_depmod()
rm -f "$depmod_cxl_conf"
rm -f "$depmod_load_cxl_conf"
fi
system_map="$prefix/System.map"
if [ ! -f "$system_map" ]; then
system_map="$prefix/System.map-$kver"
fi
depmod -b "$prefix" -F "$system_map" -C "$depmod_dir" "$kver"
}

__update_existing_rootfs()
Expand Down Expand Up @@ -566,7 +571,7 @@ __update_existing_rootfs()
rsync "${rsync_opts[@]}" "$ndctl/" "$ndctl_dst"
fi

sudo -E bash -c "$(declare -f setup_depmod); _arg_nfit_test=$_arg_nfit_test; _arg_cxl_test=$_arg_cxl_test; setup_depmod $inst_prefix"
sudo -E bash -c "$(declare -f setup_depmod); _arg_nfit_test=$_arg_nfit_test; _arg_cxl_test=$_arg_cxl_test; kver=$kver; setup_depmod $inst_prefix"
sudo -E bash -c "$(declare -f setup_autorun); _arg_autorun=$_arg_autorun; setup_autorun $inst_prefix"
umount_rootfs 2
}
Expand Down

0 comments on commit 2ed0ed3

Please sign in to comment.