From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/2] linux: do not install images in subdirectories
Date: Fri, 03 Apr 2020 00:25:05 +0200 [thread overview]
Message-ID: <877dyx7cfy.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <20200402214549.2977215-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni's message of "Thu, 2 Apr 2020 23:45:48 +0200")
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:
> The Linux kernel image is typically found in arch/ARCH/boot/, which is
> why LINUX_IMAGE_PATH is defined as:
> LINUX_IMAGE_PATH = $(LINUX_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME)
> However, on MIPS, some kernel image types are available from
> arch/mips/boot/compressed, or even at the top-level directory. For
> such cases, LINUX_IMAGE_NAME might be set (using
> BR2_LINUX_KERNEL_IMAGE_NAME) to values such as:
> compressed/vmlinux.bin.z
> or
> ../../../uzImage.bin
> Except that the line:
> $(INSTALL) -m 0644 -D $(LINUX_IMAGE_PATH) $(1)/$(notdir $(LINUX_IMAGE_NAME))
This is a bit confusing, as it is because notdir was NOT used that it
didn't work, so I've dropped that from the commit message and committed,
thanks.
> will lead to such images be installed in:
> $(TARGET_DIR)/boot/compressed/vmlinux.bin.z
> $(BINARIES_DIR)/compressed/vmlinux.bin.z
> and:
> $(TARGET_DIR)/boot/../../../uzImage.bin
> $(BINARIES_DIR)/../../../uzImage.bin
> which of course is completely bogus.
> So let's install them under their name, not their full relative path
> to arch/ARCH/boot/.
> Reported-by: Paul Cercueil <paul@crapouillou.net>
> Cc: Paul Cercueil <paul@crapouillou.net>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> linux/linux.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> diff --git a/linux/linux.mk b/linux/linux.mk
> index b2ceeecafb..3d9052a337 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -496,7 +496,7 @@ else
> # Otherwise, just install the unique image generated by the kernel
> # build process.
> define LINUX_INSTALL_IMAGE
> - $(INSTALL) -m 0644 -D $(LINUX_IMAGE_PATH) $(1)/$(LINUX_IMAGE_NAME)
> + $(INSTALL) -m 0644 -D $(LINUX_IMAGE_PATH) $(1)/$(notdir $(LINUX_IMAGE_NAME))
> endef
> endif
> --
> 2.25.1
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
next prev parent reply other threads:[~2020-04-02 22:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-02 21:45 [Buildroot] [PATCH 1/2] linux: do not install images in subdirectories Thomas Petazzoni
2020-04-02 21:45 ` [Buildroot] [PATCH 2/2] linux: adjust BR2_LINUX_KERNEL_IMAGE_NAME help text Thomas Petazzoni
2020-04-02 22:25 ` Peter Korsgaard
2020-04-08 12:51 ` Peter Korsgaard
2020-04-02 22:25 ` Peter Korsgaard [this message]
2020-04-03 5:18 ` [Buildroot] [PATCH 1/2] linux: do not install images in subdirectories Thomas Petazzoni
2020-04-08 12:50 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877dyx7cfy.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).