[PATCH] tty: vt: move conmakehash to drivers/tty/vt/ from scripts/

[PATCH] tty: vt: move conmakehash to drivers/tty/vt/ from scripts/

[Masahiro Yamada]

scripts/conmakehash is only used for generating
drivers/tty/vt/consolemap_deftbl.c

Move it to the related directory.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 drivers/tty/vt/.gitignore                 | 1 +
 drivers/tty/vt/Makefile                   | 6 ++++--
 {scripts => drivers/tty/vt}/conmakehash.c | 0
 scripts/.gitignore                        | 1 -
 scripts/Makefile                          | 3 ---
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename {scripts => drivers/tty/vt}/conmakehash.c (100%)

diff --git a/drivers/tty/vt/.gitignore b/drivers/tty/vt/.gitignore
index 9b38b85f9d9a..3ecf42234d89 100644
--- a/drivers/tty/vt/.gitignore
+++ b/drivers/tty/vt/.gitignore
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
+conmakehash
 consolemap_deftbl.c
 defkeymap.c
diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
index edbbe0ccdb83..329ca336b8ee 100644
--- a/drivers/tty/vt/Makefile
+++ b/drivers/tty/vt/Makefile
@@ -12,10 +12,12 @@ obj-$(CONFIG_HW_CONSOLE)		+= vt.o defkeymap.o
 # Files generated that shall be removed upon make clean
 clean-files := consolemap_deftbl.c defkeymap.c
 
+hostprogs-y += conmakehash
+
 quiet_cmd_conmk = CONMK   $@
-      cmd_conmk = scripts/conmakehash $< > $@
+      cmd_conmk = $(obj)/conmakehash $< > $@
 
-$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
+$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
 	$(call cmd,conmk)
 
 $(obj)/defkeymap.o:  $(obj)/defkeymap.c
diff --git a/scripts/conmakehash.c b/drivers/tty/vt/conmakehash.c
similarity index 100%
rename from scripts/conmakehash.c
rename to drivers/tty/vt/conmakehash.c
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 4aa1806c59c2..fcbc81f7c3d4 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -2,7 +2,6 @@
 # Generated files
 #
 bin2c
-conmakehash
 kallsyms
 unifdef
 recordmcount
diff --git a/scripts/Makefile b/scripts/Makefile
index 00c47901cb06..96f155b582dd 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -4,14 +4,11 @@
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
 # kallsyms:      Find all symbols in vmlinux
-# conmakehash:   Create chartable
-# conmakehash:	 Create arrays for initializing the kernel console tables
 
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 
 hostprogs-$(CONFIG_BUILD_BIN2C)  += bin2c
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
-hostprogs-$(CONFIG_VT)           += conmakehash
 hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount
 hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable
 hostprogs-$(CONFIG_ASN1)	 += asn1_compiler
-- 
2.17.1

Re: [PATCH] tty: vt: move conmakehash to drivers/tty/vt/ from scripts/

[Greg Kroah-Hartman]

On Tue, Dec 17, 2019 at 08:06:33PM +0900, Masahiro Yamada wrote:
> scripts/conmakehash is only used for generating
> drivers/tty/vt/consolemap_deftbl.c
> 
> Move it to the related directory.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
> 
>  drivers/tty/vt/.gitignore                 | 1 +
>  drivers/tty/vt/Makefile                   | 6 ++++--
>  {scripts => drivers/tty/vt}/conmakehash.c | 0
>  scripts/.gitignore                        | 1 -
>  scripts/Makefile                          | 3 ---
>  5 files changed, 5 insertions(+), 6 deletions(-)
>  rename {scripts => drivers/tty/vt}/conmakehash.c (100%)

I thought we wanted scripts to be in the scripts directory :)

Anyway, this is fine, I'll take it in my tree.

thanks,

greg k-h