diff options
| author | Alexander Koskovich <zvnexus@outlook.com> | 2021-03-12 12:13:36 -0700 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-01-13 16:38:27 +0800 |
| commit | d19851547c9509b24c19c482949240871375d6f8 (patch) | |
| tree | efc82f8cf4f5fa5dd1dca00f21cb3085ea78e38f | |
| parent | da521f8aa66aba8659377542757088f8509a457e (diff) | |
kernel_definitions: Fix depmod after no longer being hardcoded.
* "depmod" is not allowed to be used. See https://android.googlesource.com/platform/build/+/master/Changes.md#PATH_Tools for more information.
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/Makefile?h=linux-4.19.y&id=ccf4f2933df8bf3b7a070bfbb7b99fbff9fa63cf
Change-Id: I5595797a53bf5ef3782674a6a4f1b9ec7acf4656
| -rw-r--r-- | kernel_definitions.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel_definitions.mk b/kernel_definitions.mk index db48ce8..1b1ba85 100644 --- a/kernel_definitions.mk +++ b/kernel_definitions.mk @@ -15,6 +15,7 @@ ifeq ($(TARGET_KERNEL_SOURCE),) TARGET_KERNEL_SOURCE := kernel/$(TARGET_KERNEL) endif +DEPMOD := $(HOST_OUT_EXECUTABLES)/depmod$(HOST_EXECUTABLE_SUFFIX) DTC := $(HOST_OUT_EXECUTABLES)/dtc$(HOST_EXECUTABLE_SUFFIX) #UFDT_APPLY_OVERLAY := $(HOST_OUT_EXECUTABLES)/ufdt_apply_overlay$(HOST_EXECUTABLE_SUFFIX) @@ -33,6 +34,7 @@ TARGET_KERNEL_MAKE_ENV += HOSTAR=$(SOURCE_ROOT)/prebuilts/gcc/linux-x86/host/x86 TARGET_KERNEL_MAKE_ENV += HOSTLD=$(SOURCE_ROOT)/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/bin/x86_64-linux-ld TARGET_KERNEL_MAKE_CFLAGS = "-I/usr/include -I/usr/include/x86_64-linux-gnu -L/usr/lib -L/usr/lib/x86_64-linux-gnu -fuse-ld=lld" TARGET_KERNEL_MAKE_ENV += BISON_PKGDATADIR=$(SOURCE_ROOT)/prebuilts/build-tools/common/bison +TARGET_KERNEL_MAKE_ENV += DEPMOD=$(SOURCE_ROOT)/$(HOST_OUT_EXECUTABLES)/depmod TARGET_KERNEL_MAKE_ENV += YACC=$(SOURCE_ROOT)/prebuilts/build-tools/linux-x86/bin/bison TARGET_KERNEL_MAKE_ENV += LEX=$(SOURCE_ROOT)/prebuilts/build-tools/linux-x86/bin/flex TARGET_KERNEL_MAKE_ENV += M4=$(SOURCE_ROOT)/prebuilts/build-tools/$(HOST_OS)-x86/bin/m4 @@ -284,7 +286,7 @@ endef # this will ensure in subsequent builds, i.e. no-op incremental builds, modules depends on $(KERNEL_USR) \ # will not get recompiled. -$(KERNEL_HEADERS_INSTALL): $(DTC) | $(KERNEL_OUT) +$(KERNEL_HEADERS_INSTALL): $(DTC) $(DEPMOD) | $(KERNEL_OUT) $(call build-kernel,$(KERNEL_DEFCONFIG),$(KERNEL_OUT),$(KERNEL_MODULES_OUT),$(KERNEL_HEADERS_INSTALL),1,$(TARGET_PREBUILT_INT_KERNEL)) touch $(KERNEL_USR_TS) |