From 79d9268a235e735c23f8ac62637f5fcc7baa30df Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 22 Aug 2018 18:05:37 +0000 Subject: [PATCH] [kernel] define extra tag to distinguish patch versions Since we are starting to support download pre-built kernel packages, every time we add any change to the kernel. We have to make some distinctive mark in the kernel version so that we know what version we are building/downloading. This is the infrastructure work to get kernel subversion updated in target. Signed-off-by: Ying Xie --- rules/linux-kernel.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rules/linux-kernel.mk b/rules/linux-kernel.mk index 05caf384bcc6..705b22b7bc49 100644 --- a/rules/linux-kernel.mk +++ b/rules/linux-kernel.mk @@ -4,15 +4,16 @@ KVERSION_SHORT = 4.9.0-7 KVERSION = $(KVERSION_SHORT)-amd64 KERNEL_VERSION = 4.9.110 KERNEL_SUBVERSION = 3+deb9u2 +KERNEL_EXTRA_TAG = -export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION +export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION KERNEL_EXTRA_TAG -LINUX_HEADERS_COMMON = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_all.deb +LINUX_HEADERS_COMMON = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)$(KERNEL_EXTRA_TAG)_all.deb $(LINUX_HEADERS_COMMON)_SRC_PATH = $(SRC_PATH)/sonic-linux-kernel SONIC_MAKE_DEBS += $(LINUX_HEADERS_COMMON) -LINUX_HEADERS = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb +LINUX_HEADERS = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)$(KERNEL_EXTRA_TAG)_amd64.deb $(eval $(call add_derived_package,$(LINUX_HEADERS_COMMON),$(LINUX_HEADERS))) -LINUX_KERNEL = linux-image-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb +LINUX_KERNEL = linux-image-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)$(KERNEL_EXTRA_TAG)_amd64.deb $(eval $(call add_derived_package,$(LINUX_HEADERS_COMMON),$(LINUX_KERNEL)))