linux-kernel - Re: [PATCH] riscv: move the (z)install rules to arch/riscv/Makefile

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <mhng-fe558e10-6cee-4e55-b975-8c525c2bcb02@palmerdabbelt-glaptop>
Date:   Fri, 13 Aug 2021 22:00:20 -0700 (PDT)
From:   Palmer Dabbelt <palmer@...belt.com>
To:     masahiroy@...nel.org
CC:     Paul Walmsley <paul.walmsley@...ive.com>, aou@...s.berkeley.edu,
        linux-riscv@...ts.infradead.org, masahiroy@...nel.org,
        wangkefeng.wang@...wei.com, tklauser@...tanz.ch,
        vitaly.wool@...sulko.com, linux-kernel@...r.kernel.org
Subject:     Re: [PATCH] riscv: move the (z)install rules to arch/riscv/Makefile

On Thu, 29 Jul 2021 07:21:47 PDT (-0700), masahiroy@...nel.org wrote:
> Currently, the (z)install targets in arch/riscv/Makefile descend into
> arch/riscv/boot/Makefile to invoke the shell script, but there is no
> good reason to do so.
>
> arch/riscv/Makefile can run the shell script directly.
>
> Signed-off-by: Masahiro Yamada <masahiroy@...nel.org>
> ---
>
>  arch/riscv/Makefile      | 7 +++++--
>  arch/riscv/boot/Makefile | 8 --------
>  2 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
> index bc74afdbf31e..3c437fb09a07 100644
> --- a/arch/riscv/Makefile
> +++ b/arch/riscv/Makefile
> @@ -126,8 +126,11 @@ $(BOOT_TARGETS): vmlinux
>  Image.%: Image
>  	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
>
> -zinstall install:
> -	$(Q)$(MAKE) $(build)=$(boot) $@
> +install: install-image = Image
> +zinstall: install-image = Image.gz
> +install zinstall:
> +	$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
> +	$(boot)/$(install-image) System.map "$(INSTALL_PATH)"
>
>  archclean:
>  	$(Q)$(MAKE) $(clean)=$(boot)
> diff --git a/arch/riscv/boot/Makefile b/arch/riscv/boot/Makefile
> index 6bf299f70c27..becd0621071c 100644
> --- a/arch/riscv/boot/Makefile
> +++ b/arch/riscv/boot/Makefile
> @@ -58,11 +58,3 @@ $(obj)/Image.lzo: $(obj)/Image FORCE
>
>  $(obj)/loader.bin: $(obj)/loader FORCE
>  	$(call if_changed,objcopy)
> -
> -install:
> -	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
> -	$(obj)/Image System.map "$(INSTALL_PATH)"
> -
> -zinstall:
> -	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
> -	$(obj)/Image.gz System.map "$(INSTALL_PATH)"

Admittidly I don't see a reason to do it this way either, but it looks 
like the other common ports (I checked arm64 and x86) are doing things 
this way.  I don't really care that much about which way we do it, but 
it'd be better to keep everyone aligned.

Are you converting the other ports over as well?