From bc49411f58e0da3b5d23605fdf9d61d0811edbad Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 29 Mar 2021 20:35:58 -0400 Subject: [PATCH] kernel.mk: Missed cross-env kernel variable fix. (#4531) Export REQUIRE_KERNEL_MODULE to default ENV Fix KERNEL_ROOT to point to $(WORK_DIR)/linux --- mk/spksrc.cross-env.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/spksrc.cross-env.mk b/mk/spksrc.cross-env.mk index e6915110b851..1ab1d5b9e09a 100644 --- a/mk/spksrc.cross-env.mk +++ b/mk/spksrc.cross-env.mk @@ -5,8 +5,9 @@ ENV += WORK_DIR=$(WORK_DIR) ENV += INSTALL_PREFIX=$(INSTALL_PREFIX) ifeq ($(strip $(REQUIRE_KERNEL)),1) -ENV += KERNEL_ROOT=$(WORK_DIR)/../../../kernel/syno-$(ARCH)-$(TCVERSION)/work/source/linux -KERNEL_ROOT=$(WORK_DIR)/../../../kernel/syno-$(ARCH)-$(TCVERSION)/work/source/linux +ENV += REQUIRE_KERNEL_MODULE="$(REQUIRE_KERNEL_MODULE)" +ENV += KERNEL_ROOT=$(WORK_DIR)/linux +KERNEL_ROOT=$(WORK_DIR)/linux endif ifeq ($(strip $(REQUIRE_TOOLKIT)),1)