Commit d38b6968 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "kbuild: fix make -rR breakage" 



This reverts commit e5c44fd8.

Thanks to Daniel Ritz and Michal Piotrowski for noticing the problem.

Daniel says:

  "[The] reason is a recent change that made modules always shows as
   module.mod.  it breaks modprobe and probably many scripts..besides
   lsmod looking horrible

   stuff like this in modprobe.conf:
        install pcmcia_core /sbin/modprobe --ignore-install pcmcia_core; /sbin/modprobe pcmcia
   makes modprobe fork/exec endlessly calling itself...until oom
   interrupts it"

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent eb99adde

scripts/Kbuild.include

+0 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ space := $(empty) $(empty) 
# contain a comma

depfile = $(subst $(comma),_,$(@D)/.$(@F).d)



###

# basetarget equals the filename of the target with no extension.

# So 'foo/bar.o' becomes 'bar'

basetarget = $(basename $(notdir $@))



###

# Escape single quote for use in echo statements

escsq = $(subst $(squote),'\$(squote)',$1)

scripts/Makefile.build

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M] 
$(obj-m)              : quiet_modtag := [M]



# Default for not multi-part modules

modname = $(basetarget)

modname = $(*F)



$(multi-objs-m)         : modname = $(modname-multi)

$(multi-objs-m:.o=.i)   : modname = $(modname-multi)

scripts/Makefile.host

+2 −4
Original line number Diff line number Diff line
@@ -80,10 +80,8 @@ obj-dirs += $(host-objdirs) 
#####

# Handle options to gcc. Support building with separate output directory



_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   \

                 $(HOSTCFLAGS_$(basetarget).o)

_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \

                 $(HOSTCXXFLAGS_$(basetarget).o)

_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   $(HOSTCFLAGS_$(*F).o)

_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) $(HOSTCXXFLAGS_$(*F).o)



ifeq ($(KBUILD_SRC),)

__hostc_flags	= $(_hostc_flags)

scripts/Makefile.lib

+3 −3
Original line number Diff line number Diff line
@@ -82,12 +82,12 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs)) 
#       than one module. In that case KBUILD_MODNAME will be set to foo_bar,

#       where foo and bar are the name of the modules.

name-fix = $(subst $(comma),_,$(subst -,_,$1))

basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"

basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))"

modname_flags  = $(if $(filter 1,$(words $(modname))),\

                 -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")



_c_flags       = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(basetarget).o)

_a_flags       = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o)

_c_flags       = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o)

_a_flags       = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)

_cpp_flags     = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F))



# If building the kernel in a separate objtree expand all occurrences

scripts/Makefile.modpost

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ $(modules:.ko=.mod.c): __modpost ; 
# Step 5), compile all *.mod.c files



# modname is set to make c_flags define KBUILD_MODNAME

modname = $(basetarget)

modname = $(*F)



quiet_cmd_cc_o_c = CC      $@

      cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE)	\

CRA Git | Maintained and supported by SUSTech CRA and CCSE