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

Commit 19961b53 authored by Kelvin Zhang's avatar Kelvin Zhang
Browse files

Copy all files from BOARD_SYSTEM_DLKM_SRC 

BOARD_SYSTEM_DLKM_SRC might contain files such as modules.dep. These
files also need to be copied, so relax the globbing pattern to copy all
files under BOARD_SYSTEM_DLKM_SRC.

Test: th
Bug: 267014648
Change-Id: I1fef8f8d7fe01fd4bd99d62981c108d95ef47bfe
parent aa055f06

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -599,9 +599,9 @@ $(foreach kmd,$(BOARD_KERNEL_MODULE_DIRS), \ 
ifeq ($(BOARD_SYSTEM_KERNEL_MODULES),)

ifneq ($(BOARD_SYSTEM_DLKM_SRC),)

ifneq ($(wildcard $(BOARD_SYSTEM_DLKM_SRC)/*),)

  SYSTEM_KERNEL_MODULES := $(call find-files-in-subdirs,$(BOARD_SYSTEM_DLKM_SRC),*.ko,.)

  SRC_SYSTEM_KERNEL_MODULES := $(patsubst %,$(BOARD_SYSTEM_DLKM_SRC)/%,$(SYSTEM_KERNEL_MODULES))

  DST_SYSTEM_KERNEL_MODULES := $(patsubst %,:$(TARGET_OUT_SYSTEM_DLKM)/%,$(SYSTEM_KERNEL_MODULES))

  SYSTEM_KERNEL_MODULES := $(shell find $(BOARD_SYSTEM_DLKM_SRC) -type f)

  SRC_SYSTEM_KERNEL_MODULES := $(SYSTEM_KERNEL_MODULES)

  DST_SYSTEM_KERNEL_MODULES := $(patsubst $(BOARD_SYSTEM_DLKM_SRC)/%,:$(TARGET_OUT_SYSTEM_DLKM)/%,$(SRC_SYSTEM_KERNEL_MODULES))

  SYSTEM_KERNEL_MODULE_COPY_PAIRS := $(join $(SRC_SYSTEM_KERNEL_MODULES),$(DST_SYSTEM_KERNEL_MODULES))

  ALL_DEFAULT_INSTALLED_MODULES += $(call copy-many-files,$(SYSTEM_KERNEL_MODULE_COPY_PAIRS))

endif