mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
ee7a223433
When the split was done, the case for testing kernel version wasn't handled and only the to-be-compiled kernel version details files was included. This cause the kernel Linux-Testing-Version output from makefile target DUMP to report only the kernel version without the minor version (example 6.1 instead of 6.1.29). This value is expected with the full kernel version and this cause the dump-target-info.pl script to not correctly identify if a target have a testing kernel for the kernels calls. Fix this regression by correctly including the kernel details files if the target declare support for a testing kernel version. Fixes:0765466a42("kernel: split kernel version to dedicated files") Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> (cherry picked from commit595608eb3f)
52 lines
1.9 KiB
Makefile
52 lines
1.9 KiB
Makefile
|
|
# Use the default kernel version if the Makefile doesn't override it
|
|
LINUX_RELEASE?=1
|
|
|
|
ifdef CONFIG_TESTING_KERNEL
|
|
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
|
endif
|
|
|
|
KERNEL_DETAILS_FILE=$(INCLUDE_DIR)/kernel-$(KERNEL_PATCHVER)
|
|
ifeq ($(wildcard $(KERNEL_DETAILS_FILE)),)
|
|
$(error Missing kernel version/hash file for $(KERNEL_PATCHVER). Please create $(KERNEL_DETAILS_FILE))
|
|
endif
|
|
|
|
include $(KERNEL_DETAILS_FILE)
|
|
|
|
ifdef KERNEL_TESTING_PATCHVER
|
|
KERNEL_TESTING_DETAILS_FILE=$(INCLUDE_DIR)/kernel-$(KERNEL_TESTING_PATCHVER)
|
|
ifeq ($(wildcard $(KERNEL_TESTING_DETAILS_FILE)),)
|
|
$(error Missing kernel version/hash file for $(KERNEL_TESTING_PATCHVER). Please create $(KERNEL_TESTING_DETAILS_FILE))
|
|
endif
|
|
|
|
include $(KERNEL_TESTING_DETAILS_FILE)
|
|
endif
|
|
|
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
|
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
|
|
|
ifneq ($(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),)
|
|
LINUX_VERSION:=$(call sanitize_uri,$(call remove_uri_prefix,$(CONFIG_KERNEL_GIT_CLONE_URI)))
|
|
ifeq ($(call qstrip,$(CONFIG_KERNEL_GIT_REF)),)
|
|
CONFIG_KERNEL_GIT_REF:=HEAD
|
|
endif
|
|
LINUX_VERSION:=$(LINUX_VERSION)-$(call sanitize_uri,$(CONFIG_KERNEL_GIT_REF))
|
|
else
|
|
ifdef KERNEL_PATCHVER
|
|
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
|
|
endif
|
|
ifdef KERNEL_TESTING_PATCHVER
|
|
LINUX_TESTING_VERSION:=$(KERNEL_TESTING_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_TESTING_PATCHVER)))
|
|
endif
|
|
endif
|
|
|
|
split_version=$(subst ., ,$(1))
|
|
merge_version=$(subst $(space),.,$(1))
|
|
KERNEL_BASE=$(firstword $(subst -, ,$(LINUX_VERSION)))
|
|
KERNEL=$(call merge_version,$(wordlist 1,2,$(call split_version,$(KERNEL_BASE))))
|
|
KERNEL_PATCHVER ?= $(KERNEL)
|
|
|
|
# disable the md5sum check for unknown kernel versions
|
|
LINUX_KERNEL_HASH:=$(LINUX_KERNEL_HASH-$(strip $(LINUX_VERSION)))
|
|
LINUX_KERNEL_HASH?=x
|