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

Commit ef591a55 authored by 이건호's avatar 이건호 Committed by Michal Marek
Browse files

scripts/Makefile.modpost: error in finding modules from .mod files. 



This error may happen when the user's id or path includes .ko string.
For example, user's id is xxx.ko and building test.ko module,
the test.mod file lists ko name and all object files.
   /home/xxx.ko/kernel_dev/device/drivers/test.ko
   /home/xxx.ko/kernel_dev/device/drivers/test_main.o
/home/xxx.ko/kernel_dev/device/drivers/test_io.o ...
Current Makefile.modpost and Makefile.modinst find and list up not
only test.ko but also other object files.
because all of object file's path includes .ko string.
This is a patch to fix it.

Signed-off-by: default avatarGunho Lee <gunho.lee@lge.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 70cfe026

scripts/Makefile.modinst

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ include scripts/Kbuild.include 


#



__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))

__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))

modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))



PHONY += $(modules)

scripts/Makefile.modpost

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ kernelsymfile := $(objtree)/Module.symvers 
modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers



# Step 1), find all modules listed in $(MODVERDIR)/

__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))

__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))

modules   := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))



# Stop after building .o files if NOFINAL is set. Makes compile tests quicker