[why] the define_files will generate the PKGBUILD and when run define_files_auto_pack will automatic run makepkg even though the job is not for makepkg --- bin/lkp-setup-rootfs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/bin/lkp-setup-rootfs b/bin/lkp-setup-rootfs index 2890601e..2e50b6a2 100755 --- a/bin/lkp-setup-rootfs +++ b/bin/lkp-setup-rootfs @@ -187,14 +187,14 @@ define_files_pkg_pack() ( local benchmark=${1#pkg/} export benchmark=${benchmark%/PKGBUILD} - $LKP_SRC/tests/makepkg + $LKP_SRC/tests/cci-makepkg ) }
# There may be $program-dev or $program-dev-dev in the # "$LKP_SRC/distro/depends" directory, # when the value passed by $define_files is "distro/depends/$program-dev", -# you don't know which script in "makepkg" or "pack-deps" to execute, +# you don't know which script in "cci-makepkg" or "pack-deps" to execute, # so it needs to be handled sparately. # Save the result to # "/srv/initrd/deps/$os/$os_arch/$os_version/$deps_benchmark.cgz", @@ -208,7 +208,7 @@ define_files_deps_pack() [ $suffix == "dev" ] && [ -f "$LKP_SRC/pkg/$pkg_benchmark/PKGBUILD" ] && { ( export benchmark=$pkg_benchmark - $LKP_SRC/tests/makepkg + $LKP_SRC/tests/cci-makepkg ) return 0 } @@ -229,7 +229,7 @@ define_files_auto_pack() [ -f "$LKP_SRC/$path" ] || continue
[ ${path##*/} = PKGBUILD ] && { - define_files_pkg_pack $path + define_files_pkg_pack $path } [ ${path#distro/depends/} != $path ] && { define_files_deps_pack $path @@ -251,8 +251,9 @@ chmod_root_ssh while true; do set_tbox_wtmp 'running' . $job_script define_files - define_files_auto_pack $define_files - if [ "$os_mount" != "initramfs" ]; then + if [ "$suite" == 'cci-makepkg'] || [ "$suite" == 'cci-depends' ];then + define_files_auto_pack $define_files + elif [ "$os_mount" != "initramfs" ]; then wget_install_cgz $initrd_deps wget_install_cgz $initrd_pkg fi