[Compass-ci] Re: [PATCH compass-ci] job.cr: give kernel_version a default value

pls ignore this mail.

On Wed, Nov 25, 2020 at 12:41:18PM +0800, Xu Xijian wrote:

If the kernel_version is not set by users, give it a default value as same as vmlinuz version.

Signed-off-by: Xu Xijian hdxuxijian@163.com

src/lib/job.cr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/job.cr b/src/lib/job.cr index b533665..fa804e5 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -358,11 +358,11 @@ class Job

private def set_kernel_version boot_dir = "#{SRV_OS}/#{os_dir}/boot"

• suffix = "-#{kernel_version}" if self["kernel_version"]?
• self["linux_vmlinuz_path"] = File.real_path("#{boot_dir}/vmlinuz#{suffix}")

• self["kernel_version"] ||= File.basename(File.real_path "#{boot_dir}/vmlinuz").gsub("vmlinuz-", "")
• self["linux_vmlinuz_path"] = File.real_path("#{boot_dir}/vmlinuz-#{kernel_version}") if "#{os_mount}" == "initramfs"

•  self["linux_modules_initrd"] = File.real_path("#{boot_dir}/modules#{suffix}.cgz")
  

•  self["linux_headers_initrd"] = File.real_path("#{boot_dir}/headers#{suffix}.cgz")
  

•  self["linux_modules_initrd"] = File.real_path("#{boot_dir}/modules-#{kernel_version}.cgz")
  

•  self["linux_headers_initrd"] = File.real_path("#{boot_dir}/headers-#{kernel_version}.cgz")
  

  end end

-- 2.23.0