Add quotes where UIMAGE_NAME is used, rather than where it is defined.
This allows the UIMAGE_NAME variable to be set by the user.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v4)

Changes in v4:
- Add a patch to move the single quotes for image name

 scripts/Makefile.lib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 68d0134bdbf9..1a965fe68e01 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -487,14 +487,14 @@ UIMAGE_OPTS-y ?=
 UIMAGE_TYPE ?= kernel
 UIMAGE_LOADADDR ?= arch_must_set_this
 UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR)
-UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)'
+UIMAGE_NAME ?= Linux-$(KERNELRELEASE)
 
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(BASH) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
 			-C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \
 			-T $(UIMAGE_TYPE) \
 			-a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \
-			-n $(UIMAGE_NAME) -d $< $@
+			-n '$(UIMAGE_NAME)' -d $< $@
 
 # XZ
 # ---------------------------------------------------------------------------
-- 
2.42.0.869.gea05f2083d-goog

On Sat, Nov 11, 2023 at 9:29 AM Simon Glass <sjg@chromium.org> wrote:
>
> Add quotes where UIMAGE_NAME is used, rather than where it is defined.
> This allows the UIMAGE_NAME variable to be set by the user.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---


I applied this to linux-kbuild/fixes.

I changed the subject to
"kbuild: Move the single quotes for image name"
because it is unrelated to arm.


Thanks.



> (no changes since v4)
>
> Changes in v4:
> - Add a patch to move the single quotes for image name
>
>  scripts/Makefile.lib | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 68d0134bdbf9..1a965fe68e01 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -487,14 +487,14 @@ UIMAGE_OPTS-y ?=
>  UIMAGE_TYPE ?= kernel
>  UIMAGE_LOADADDR ?= arch_must_set_this
>  UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR)
> -UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)'
> +UIMAGE_NAME ?= Linux-$(KERNELRELEASE)
>
>  quiet_cmd_uimage = UIMAGE  $@
>        cmd_uimage = $(BASH) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
>                         -C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \
>                         -T $(UIMAGE_TYPE) \
>                         -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \
> -                       -n $(UIMAGE_NAME) -d $< $@
> +                       -n '$(UIMAGE_NAME)' -d $< $@
>
>  # XZ
>  # ---------------------------------------------------------------------------
> --
> 2.42.0.869.gea05f2083d-goog
>


--
Best Regards

Masahiro Yamada

Hi Masahiro,

On Thu, 16 Nov 2023 at 04:19, Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> On Sat, Nov 11, 2023 at 9:29 AM Simon Glass <sjg@chromium.org> wrote:
> >
> > Add quotes where UIMAGE_NAME is used, rather than where it is defined.
> > This allows the UIMAGE_NAME variable to be set by the user.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
>
>
> I applied this to linux-kbuild/fixes.
>
> I changed the subject to
> "kbuild: Move the single quotes for image name"
> because it is unrelated to arm.
>
>
> Thanks.

Thank you. I sent a v6 with a fix and without this patch.

Regards,
Simon