Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88110713 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: hardcode genksyms path and remove GENKSYMS variable 



The genksyms source was integrated into the kernel tree in 2003.

I do not expect anybody still using the external /sbin/genksyms.
Kbuild does not need to provide the ability to override GENKSYMS.

Let's remove the GENKSYMS variable, and use the hardcoded path.

Since it occurred in the pre-git era, I attached the commit message
in case somebody is interested in the historical background.

  | Author: Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
  | Date:   Wed Feb 19 04:17:28 2003 -0600
  |
  | kbuild: [PATCH] put genksyms in scripts dir
  |
  | This puts genksyms into scripts/genksyms/.
  |
  | genksyms used to be maintained externally, though the only possible user
  | was the kernel build. Moving it into the kernel sources makes it easier to
  | keep it uptodate, like for example updating it to generate linker scripts
  | directly instead of postprocessing the generated header file fragments
  | with sed, as we do currently.
  |
  | Also, genksyms does not handle __typeof__, which needs to be fixed since
  | some of the exported symbol in the kernel are defined using __typeof__.
  |
  | (Rusty Russell/me)

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent b513adf4

Makefile

+1 −2
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ OBJDUMP = $(CROSS_COMPILE)objdump 
LEX		= flex

YACC		= bison

AWK		= awk

GENKSYMS	= scripts/genksyms/genksyms

INSTALLKERNEL  := installkernel

DEPMOD		= /sbin/depmod

PERL		= perl
@@ -443,7 +442,7 @@ GCC_PLUGINS_CFLAGS := 


export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC

export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS

export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE

export MAKE LEX YACC AWK INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE

export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS



export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS

scripts/Makefile.build

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ $(obj)/%.i: $(src)/%.c FORCE 
# These mirror gensymtypes_S and co below, keep them in synch.

cmd_gensymtypes_c =                                                         \

    $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \

    $(GENKSYMS) $(if $(1), -T $(2))                                         \

    scripts/genksyms/genksyms $(if $(1), -T $(2))                           \

     $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS))                             \

     $(if $(KBUILD_PRESERVE),-p)                                            \

     -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
@@ -320,7 +320,7 @@ cmd_gensymtypes_S = \ 
     grep "\<___EXPORT_SYMBOL\>" |                                          \

     sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ; } | \

    $(CPP) -D__GENKSYMS__ $(c_flags) -xc - |                                \

    $(GENKSYMS) $(if $(1), -T $(2))                                         \

    scripts/genksyms/genksyms $(if $(1), -T $(2))                           \

     $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS))                             \

     $(if $(KBUILD_PRESERVE),-p)                                            \

     -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))