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

Commit 669fb69b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "kbuild: force to build vmlinux if CONFIG_MODVERSION=y""

parents 56449859 e2dbcb45
Loading
Loading
Loading
Loading
+5 −8
Original line number Diff line number Diff line
@@ -581,8 +581,12 @@ KBUILD_MODULES :=
KBUILD_BUILTIN := 1

# If we have only "make modules", don't compile built-in objects.
# When we're building modules with modversions, we need to consider
# the built-in objects during the descend as well, in order to
# make sure the checksums are up to date before we record them.

ifeq ($(MAKECMDGOALS),modules)
  KBUILD_BUILTIN :=
  KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
endif

# If we have "make <whatever> modules", compile modules
@@ -1385,13 +1389,6 @@ ifdef CONFIG_MODULES

all: modules

# When we're building modules with modversions, we need to consider
# the built-in objects during the descend as well, in order to
# make sure the checksums are up to date before we record them.
ifdef CONFIG_MODVERSIONS
  KBUILD_BUILTIN := 1
endif

# Build modules
#
# A module can be listed more than once in obj-m resulting in