[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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/bin/lkp-setup-rootfs b/bin/lkp-setup-rootfs index 2890601e..a3663b42 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 } @@ -228,10 +228,10 @@ define_files_auto_pack() do [ -f "$LKP_SRC/$path" ] || continue
- [ ${path##*/} = PKGBUILD ] && { - define_files_pkg_pack $path + [ ${path##*/} = PKGBUILD ] && [ $suite = 'cci-makepkg' ] && { + define_files_pkg_pack $path } - [ ${path#distro/depends/} != $path ] && { + [ ${path#distro/depends/} != $path ] && [ $suite = 'cci-depends' ] && { define_files_deps_pack $path } done
On Thu, Oct 29, 2020 at 05:31:46PM +0800, Li Ping wrote:
automatic run makepkg even though the job is
run cci-makepkg
not for makepkg
cci-makepkg
-# 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,
cci-depends
# so it needs to be handled sparately. # Save the result to # "/srv/initrd/deps/$os/$os_arch/$os_version/$deps_benchmark.cgz",
/srv/initrd/deps/$os_mount/$os_arch/$os_version/$benchmark/$deps_benchmark.cgz ^ we'll support this dir recently
Thanks, Wang Yong