Re: [PATCH 01/13] bin2c: Move bin2c in scripts/basic

Borislav Petkov
2014-06-03T16:02:19Z

On Tue, Jun 03, 2014 at 09:06:50AM -0400, Vivek Goyal wrote:
> Kexec wants to use bin2c and it wants to use it really early in the build
> process. See arch/x86/purgatory/ code in later patches.
>
> So move bin2c in scripts/basic so that it can be built very early and
> be usable by arch/x86/purgatory/
>
> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
> ---
> kernel/Makefile | 2 +-
> scripts/Makefile | 1 -
> scripts/basic/Makefile | 1 +
> scripts/basic/bin2c.c | 35 +++++++++++++++++++++++++++++++++++
> scripts/bin2c.c | 36 ------------------------------------
> 5 files changed, 37 insertions(+), 38 deletions(-)
> create mode 100644 scripts/basic/bin2c.c
> delete mode 100644 scripts/bin2c.c
>
> diff --git a/kernel/Makefile b/kernel/Makefile
> index f2a8b62..9b07bb7 100644
> --- a/kernel/Makefile
> +++ b/kernel/Makefile
> @@ -105,7 +105,7 @@ targets += config_data.gz
> $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE
> $(call if_changed,gzip)
>
> - filechk_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;")
> + filechk_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/basic/bin2c; echo "MAGIC_END;")
> targets += config_data.h
> $(obj)/config_data.h: $(obj)/config_data.gz FORCE
> $(call filechk,ikconfiggz)
> diff --git a/scripts/Makefile b/scripts/Makefile
> index 1d07860..e9d56fb 100644
> --- a/scripts/Makefile
> +++ b/scripts/Makefile
> @@ -13,7 +13,6 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include
> hostprogs-$(CONFIG_KALLSYMS) += kallsyms
> hostprogs-$(CONFIG_LOGO) += pnmtologo
> hostprogs-$(CONFIG_VT) += conmakehash
> -hostprogs-$(CONFIG_IKCONFIG) += bin2c

You also'd need to move the "bin2c" entry from scripts/.gitignore to
scripts/basic/.gitignore. I just noticed this by grepping around the
sources.

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--