Re: [PATCH v2 04/13] initramfs: rename gen_initramfs_list.sh to gen_initramfs.sh

From: Greg Thelen
Date: Mon Jan 06 2020 - 02:43:31 EST


Masahiro Yamada <masahiroy@xxxxxxxxxx> wrote:

> The comments in usr/Makefile wrongly refer to the script name (twice).
>
> Line 37:
> # The dependency list is generated by gen_initramfs.sh -l
>
> Line 54:
> # 4) Arguments to gen_initramfs.sh changes
>
> There does not exist such a script.
>
> I was going to fix the comments, but after some consideration, I thought
> "gen_initramfs.sh" would be more suitable than "gen_initramfs_list.sh"
> because it generates an initramfs image in the common usage.
>
> The script generates a list that can be fed to gen_init_cpio only when
> it is directly run without -o or -l option.
>
> Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> ---
>
> Changes in v2: None
>
> usr/Makefile | 2 +-
> usr/{gen_initramfs_list.sh => gen_initramfs.sh} | 0
> 2 files changed, 1 insertion(+), 1 deletion(-)
> rename usr/{gen_initramfs_list.sh => gen_initramfs.sh} (100%)

Will this break klibc? It might have a ref to the old name.
https://git.kernel.org/pub/scm/libs/klibc/klibc.git/tree/usr/Kbuild#n55

> diff --git a/usr/Makefile b/usr/Makefile
> index 55c942da01cd..e44a66b8c051 100644
> --- a/usr/Makefile
> +++ b/usr/Makefile
> @@ -24,7 +24,7 @@ $(obj)/initramfs_data.o: $(obj)/$(datafile_y) FORCE
> # Generate the initramfs cpio archive
>
> hostprogs-y := gen_init_cpio
> -initramfs := $(CONFIG_SHELL) $(srctree)/$(src)/gen_initramfs_list.sh
> +initramfs := $(CONFIG_SHELL) $(srctree)/$(src)/gen_initramfs.sh
> ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \
> $(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d)
> ramfs-args := \
> diff --git a/usr/gen_initramfs_list.sh b/usr/gen_initramfs.sh
> similarity index 100%
> rename from usr/gen_initramfs_list.sh
> rename to usr/gen_initramfs.sh