summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2021-11-01 12:35:44 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2021-11-01 15:16:20 +0100
commit63e405a44c81c8ea69670b57558fb70ea768065e (patch)
tree90d862c8bc129daf2fbf8b2ab27c02f957bdc806 /toolchain
parentc43037d2ecd33fdd09852d563829f8dfd18dc3af (diff)
toolchain: linux-headers: Fix kernel version for ADK_UPDATE_PATCHES_GIT
When using git to apply kernel patches, the extracted kernel sources become a git repository with HEAD not being at a tag. Therefore $(LINUX_DIR)/scripts/setlocalversion appends '+' to the kernel version string which ADK in turn does not expect. In consequence, 'modprobe' on target won't find any modules. Avoid this by creating an empty '$(LINUX_DIR)/.scmversion' file - setlocalversion recognizes it and uses its content instead of doing its own detection. Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/linux-headers/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/toolchain/linux-headers/Makefile b/toolchain/linux-headers/Makefile
index b2aed50ed..79fef22b9 100644
--- a/toolchain/linux-headers/Makefile
+++ b/toolchain/linux-headers/Makefile
@@ -41,6 +41,7 @@ ifneq ($(ADK_DISABLE_TARGET_KERNEL_PATCHES),y)
$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER) \
$(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/patches/$(KERNEL_FILE_VER) *.patch $(MAKE_TRACE)
endif
+ touch $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER)/.scmversion
touch $@
$(WRKBUILD)/.configured: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER)/.patched