-
Notifications
You must be signed in to change notification settings - Fork 887
Conversation
/cc @rkt/rkt-kvm-maintainers |
The |
Rebased to latest. |
@@ -279,7 +279,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo | |||
// kernel and hypervisor binaries are located relative to the working directory | |||
// of init (/var/lib/rkt/..../uuid) | |||
// TODO: move to path.go | |||
kernelPath := filepath.Join(common.Stage1RootfsPath(p.Root), "bzImage") | |||
kernelPath := filepath.Join(common.Stage1RootfsPath(p.Root), "kernel_image") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see bzImage
was explicitely targeted in make invocation before. I am not too much concerned with this rename, but is it being for some specific purpose or just for cosmetic reasons?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This name change here of the kernelPath file is just to avoid a confusing/inaccurate name.
Note that bzImage is the default make target for x86 builds, but that other architectures don't necessarily have a bzImage make target. For this reason I removed bzImage as the target in the make invocation so it would fall back to building the default target which should generate a kernel image usable for most other architectures. KVM on arm64 for example needs an uncompressed vmlinux file, and vmlinux is generated by the arm64 default make target.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the taking the time to write this down in details, much appreciated.
Looks fine in principle, just curious about the renaming part. Also leaving some more time for other eventual reviews. |
Fixes errors like these when building the kvm stage1 flavor for arm64: Files listed in manifest.txt are missing from usr.squashfs: libcrypt-2.21.so Signed-off-by: Geoff Levand <geoff@infradead.org>
Bzipped images are platform specific, so use generic names. Also, add an empty make recipe to the kernel image target to avoid using implicit rules. Signed-off-by: Geoff Levand <geoff@infradead.org>
Add amd64 specifier. Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Geoff Levand <geoff@infradead.org>
Rebased to latest. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
We need to change the kernel location because in rkt/rkt#3690, the path where the kernel image was expected changed from `bzImage` to `kernel_image`.
No description provided.