Skip to content

Commit e75a06d

Browse files
zhijianli88rli9
authored andcommitted
lkp qemu: use local modules.cgz for lkp qemu if needed
if "-m /path/to/modules.cgz" is specified, use this modules.cgz directly instead of downloading from web Signed-off-by: Li Zhijian <[email protected]> Signed-off-by: Philip Li <[email protected]>
1 parent b982735 commit e75a06d

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

lib/kexec.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,31 @@ initrd_is_correct()
5151
gzip -dc $file | cpio -t >/dev/null
5252
}
5353

54+
# for lkp qemu, it will set LKP_LOCAL_RUN=1
55+
use_local_modules_initrds()
56+
{
57+
[ "$LKP_LOCAL_RUN" = "1" ] && [ "$modules_initrd" ] && {
58+
# lkp qemu will create a link to modules.cgz under $CACHE_DIR
59+
# ls -al /root/.lkp/cache/modules.cgz
60+
# lrwxrwxrwx 1 root root 21 Jun 19 08:13 /root/.lkp/cache/modules.cgz -> /lkp-qemu/modules.cgz
61+
local local_modules=$CACHE_DIR/$(basename $modules_initrd)
62+
[ -e $local_modules ] || return
63+
initrds="$local_modules "
64+
echo "use local modules: $local_modules"
65+
unset modules_initrd
66+
}
67+
}
68+
5469
download_initrd()
5570
{
5671
local _initrd
5772
local initrds
5873

5974
echo "downloading initrds ..."
6075
set_job_state "wget_initrd"
76+
77+
use_local_modules_initrds
78+
6179
for _initrd in $(echo $initrd $tbox_initrd $job_initrd $lkp_initrd $bm_initrd $modules_initrd $linux_headers_initrd $audio_sof_initrd $syzkaller_initrd $linux_selftests_initrd $linux_perf_initrd | tr , ' ')
6280
do
6381
_initrd=$(echo $_initrd | sed 's/^\///')

lkp-exec/qemu

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ validate_options()
4848
need_module="$(get_job_env $job_script 'need_modules')" || return
4949
[[ "$need_module" = "true" ]] && {
5050
[[ ! $opt_modules ]] && echo "kernel module is required, please specify it with '-m'" && return 1
51+
[[ ! -e $opt_modules ]] && echo "$opt_modules is not existed" && return 1
5152
}
5253

5354
return 0

0 commit comments

Comments
 (0)