tty: vt: move conmakehash to drivers/tty/vt/ from scripts/
Subsystems (2)
PATCH 1/1 tty: vt: move conmakehash to drivers/tty/vt/ from scripts/
scripts/conmakehash is only used for generatingdrivers/tty/vt/consolemap_deftbl.c
Move it to the related directory.
Signed-off-by Masahiro Yamada <[email protected]>
---
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%)drivers/tty/vt/.gitignore +1 -0
@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 +conmakehash consolemap_deftbl.c defkeymap.c
drivers/tty/vt/Makefile +4 -2
@@ -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
drivers/tty/vt/conmakehash.c renamed from scripts/conmakehash.c +0 -0
scripts/.gitignore +0 -1
@@ -2,7 +2,6 @@ # Generated files # bin2c -conmakehash kallsyms unifdef recordmcount
scripts/Makefile +0 -3
@@ -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
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerQuoted 8 lines · Masahiro Yamada
scripts/conmakehashis only used for generatingdrivers/tty/vt/consolemap_deftbl.cMove it to the related directory.
Signed-off-by Masahiro Yamada <[email protected]>---
Quoted 7 lines
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