2024-05-31 12:29:51

by Masahiro Yamada

Subject: [PATCH] usr: shorten cmd_initfs in Makefile

Avoid repetition of long variables.

No functional change intended.

Signed-off-by: Masahiro Yamada <[email protected]>
---

usr/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/Makefile b/usr/Makefile
index 132ef7e96e6d..75224d927025 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -62,9 +62,9 @@ $(deps_initramfs): ;
quiet_cmd_initfs = GEN $@
cmd_initfs = \
$(CONFIG_SHELL) $< -o $@ -l $(obj)/.initramfs_data.cpio.d \
- $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \
- $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) \
- $(if $(KBUILD_BUILD_TIMESTAMP), -d "$(KBUILD_BUILD_TIMESTAMP)") \
+ $(addprefix -u , $(CONFIG_INITRAMFS_ROOT_UID)) \
+ $(addprefix -g , $(CONFIG_INITRAMFS_ROOT_GID)) \
+ $(patsubst %,-d "%", $(KBUILD_BUILD_TIMESTAMP)) \
$(ramfs-input)

# We rebuild initramfs_data.cpio if:
--
2.40.1

2024-06-03 22:25:04

by Nathan Chancellor

Subject: Re: [PATCH] usr: shorten cmd_initfs in Makefile

On Fri, May 31, 2024 at 09:28:25PM +0900, Masahiro Yamada wrote:
> Avoid repetition of long variables.
>
> No functional change intended.
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Reviewed-by: Nathan Chancellor <[email protected]>

> ---
>
> usr/Makefile | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/usr/Makefile b/usr/Makefile
> index 132ef7e96e6d..75224d927025 100644
> --- a/usr/Makefile
> +++ b/usr/Makefile
> @@ -62,9 +62,9 @@ $(deps_initramfs): ;
> quiet_cmd_initfs = GEN $@
> cmd_initfs = \
> $(CONFIG_SHELL) $< -o $@ -l $(obj)/.initramfs_data.cpio.d \
> - $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \
> - $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) \
> - $(if $(KBUILD_BUILD_TIMESTAMP), -d "$(KBUILD_BUILD_TIMESTAMP)") \
> + $(addprefix -u , $(CONFIG_INITRAMFS_ROOT_UID)) \
> + $(addprefix -g , $(CONFIG_INITRAMFS_ROOT_GID)) \
> + $(patsubst %,-d "%", $(KBUILD_BUILD_TIMESTAMP)) \
> $(ramfs-input)
>
> # We rebuild initramfs_data.cpio if:
> --
> 2.40.1
>