[PATCH compass-ci] job.cr: make modules.cgz independent in initramfs
Depart modules.cgz from initramfs' cgz to enable optional kernel. Signed-off-by: Xu Xijian <xuxijian@huawei.com> --- src/lib/job.cr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 32aa662..64a4301 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -303,6 +303,8 @@ class Job "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{INITRD_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_INITRD}/modules/modules.cgz")}" temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0
On Thu, Oct 15, 2020 at 12:02:30PM +0800, Xu Xijian wrote:
Depart modules.cgz from initramfs' cgz to enable optional kernel.
Signed-off-by: Xu Xijian <xuxijian@huawei.com> --- src/lib/job.cr | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/src/lib/job.cr b/src/lib/job.cr index 32aa662..64a4301 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -303,6 +303,8 @@ class Job "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{INITRD_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_INITRD}/modules/modules.cgz")}"
/modules/ 目录与 内核的 /$os_dir/ 目录不对称, 所以难以做到一一匹配? "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/vmlinuz")}" Thanks, Fengguang
temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0
On Thu, Oct 15, 2020 at 02:26:53PM +0800, Wu Fengguang wrote:
On Thu, Oct 15, 2020 at 12:02:30PM +0800, Xu Xijian wrote:
Depart modules.cgz from initramfs' cgz to enable optional kernel.
Signed-off-by: Xu Xijian <xuxijian@huawei.com> --- src/lib/job.cr | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/src/lib/job.cr b/src/lib/job.cr index 32aa662..64a4301 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -303,6 +303,8 @@ class Job "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{INITRD_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_INITRD}/modules/modules.cgz")}"
/modules/ 目录与 内核的 /$os_dir/ 目录不对称, 所以难以做到一一匹配?
"#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/vmlinuz")}"
How about this? May be the headers.cgz also need to add. temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/modules.cgz")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/headers.cgz")}" Thanks, Chenglong
Thanks, Fengguang
temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0
On Thu, Oct 15, 2020 at 02:48:02PM +0800, Wang Chenglong wrote:
On Thu, Oct 15, 2020 at 02:26:53PM +0800, Wu Fengguang wrote:
On Thu, Oct 15, 2020 at 12:02:30PM +0800, Xu Xijian wrote:
Depart modules.cgz from initramfs' cgz to enable optional kernel.
Signed-off-by: Xu Xijian <xuxijian@huawei.com> --- src/lib/job.cr | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/src/lib/job.cr b/src/lib/job.cr index 32aa662..64a4301 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -303,6 +303,8 @@ class Job "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{INITRD_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_INITRD}/modules/modules.cgz")}"
/modules/ 目录与 内核的 /$os_dir/ 目录不对称, 所以难以做到一一匹配?
"#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/vmlinuz")}"
How about this? May be the headers.cgz also need to add. temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/modules.cgz")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/headers.cgz")}"
That looks good. Thanks, Fengguang
temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0
participants (3)
-
Wang Chenglong -
Wu Fengguang -
Xu Xijian