| Message ID | 20240502111613.1380453-4-emil.renner.berthing@canonical.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | riscv: make image compression configurable | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On Thu, May 2, 2024 at 8:16 PM Emil Renner Berthing <emil.renner.berthing@canonical.com> wrote: > > Use the KBUILD_IMAGE variable to determine the right kernel image to > install and install compressed images to /boot/vmlinuz-$version like the > 'make install' target already does. > > Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> > --- > This patch depends on Masahiro's patch at > https://lore.kernel.org/r/20240414174139.3001175-1-masahiroy@kernel.org Thank you for fixing the issue for riscv. Only the question I have is how this patch series gets in. If it waits for the next development cycle, it will be cleanly applicable. Anyway, Acked-by: Masahiro Yamada <masahiroy@kernel.org>
Masahiro Yamada wrote: > On Thu, May 2, 2024 at 8:16 PM Emil Renner Berthing > <emil.renner.berthing@canonical.com> wrote: > > > > Use the KBUILD_IMAGE variable to determine the right kernel image to > > install and install compressed images to /boot/vmlinuz-$version like the > > 'make install' target already does. > > > > Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> > > --- > > This patch depends on Masahiro's patch at > > https://lore.kernel.org/r/20240414174139.3001175-1-masahiroy@kernel.org > > Thank you for fixing the issue for riscv. > Only the question I have is how this patch series gets in. > If it waits for the next development cycle, it will be > cleanly applicable. I'm ok with waiting, but otherwise Palmer could take patch 1 and 2 and you could take patch 3. The worst that can happen is that a bisect lands on your branch that will only package the uncompressed Image in the tarballs even if Image.gz or Image.bz2 exist. CONFIG_EFI_ZBOOT=y and CONFIG_XIP_KERNEL=y_kernels will also be fine with only patch 3 applied. > Anyway, > > Acked-by: Masahiro Yamada <masahiroy@kernel.org> Thanks! /Emil > > > > > -- > Best Regards > Masahiro Yamada > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
On Sat, May 4, 2024 at 11:02 PM Emil Renner Berthing <emil.renner.berthing@canonical.com> wrote: > > Masahiro Yamada wrote: > > On Thu, May 2, 2024 at 8:16 PM Emil Renner Berthing > > <emil.renner.berthing@canonical.com> wrote: > > > > > > Use the KBUILD_IMAGE variable to determine the right kernel image to > > > install and install compressed images to /boot/vmlinuz-$version like the > > > 'make install' target already does. > > > > > > Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> > > > --- > > > This patch depends on Masahiro's patch at > > > https://lore.kernel.org/r/20240414174139.3001175-1-masahiroy@kernel.org > > > > Thank you for fixing the issue for riscv. > > Only the question I have is how this patch series gets in. > > If it waits for the next development cycle, it will be > > cleanly applicable. > > I'm ok with waiting, but otherwise Palmer could take patch 1 and 2 and you > could take patch 3. The worst that can happen is that a bisect lands on your > branch that will only package the uncompressed Image in the tarballs even if > Image.gz or Image.bz2 exist. CONFIG_EFI_ZBOOT=y and CONFIG_XIP_KERNEL=y_kernels > will also be fine with only patch 3 applied. Ah, OK. 3/3 is independently applicable. I applied this to linux-kbuild now. Thanks. (I added braces around KBUILD_IMAGE to keep consistency) I leave the first two patches to Palmer.
diff --git a/scripts/package/buildtar b/scripts/package/buildtar index ed8d9b496305..fa9bd0795d22 100755 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar @@ -54,9 +54,8 @@ cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" # Install arch-specific kernel image(s) # # Note: -# mips, arm64, and riscv copy the first image found. This may not produce -# the desired outcome because it may pick up a stale file remaining in the -# build tree. +# mips and arm64 copy the first image found. This may not produce the desired +# outcome because it may pick up a stale file remaining in the build tree. # case "${ARCH}" in x86|i386|x86_64) @@ -101,13 +100,12 @@ case "${ARCH}" in done ;; riscv) - # Please note the following code may copy a stale file. - for i in Image.bz2 Image.gz Image; do - if [ -f "${objtree}/arch/riscv/boot/${i}" ] ; then - cp -v -- "${objtree}/arch/riscv/boot/${i}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" - break - fi - done + case "${KBUILD_IMAGE##*/}" in + Image.*|vmlinuz.efi) + cp -v -- "$KBUILD_IMAGE" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}";; + *) + cp -v -- "$KBUILD_IMAGE" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}";; + esac ;; *) cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
Use the KBUILD_IMAGE variable to determine the right kernel image to install and install compressed images to /boot/vmlinuz-$version like the 'make install' target already does. Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> --- This patch depends on Masahiro's patch at https://lore.kernel.org/r/20240414174139.3001175-1-masahiroy@kernel.org --- scripts/package/buildtar | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)