- drop KERNEL_VERSION_FULL variable

make/bootstrap.mk

@@ -106,9 +106,9 @@ $(TARGET_LIB_DIR)/firmware: | $(TARGET_DIR)
 
 $(TARGET_LIB_DIR)/modules: | $(TARGET_DIR)
 	mkdir -p $@
-	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-modules/$(KERNEL_VERSION_FULL) $@
+	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-modules/$(KERNEL_VERSION) $@
 ifeq ($(BOXMODEL), nevis)
-	ln -sf $(KERNEL_VERSION_FULL) $@/$(KERNEL_VERSION_FULL)-$(BOXMODEL)
+	ln -sf $(KERNEL_VERSION) $@/$(KERNEL_VERSION)-$(BOXMODEL)
 endif
 
 $(STATIC_LIB_DIR): | $(TARGET_DIR)

make/environment-build.mk

@@ -183,7 +183,6 @@ DEBUG ?= no
 ifeq ($(BOXSERIES), hd1)
   KERNEL_VERSION_MAJOR   = 2.6.34
   KERNEL_VERSION         = 2.6.34.13
-  KERNEL_VERSION_FULL    = $(KERNEL_VERSION)
 
   DRIVERS_DIR            = nevis
   CORTEX-STRINGS         =
@@ -197,7 +196,6 @@ ifeq ($(BOXSERIES), hd1)
 else ifeq ($(BOXSERIES), hd2)
   KERNEL_VERSION_MAJOR   = 3.10
   KERNEL_VERSION         = 3.10.93
-  KERNEL_VERSION_FULL    = $(KERNEL_VERSION)
 
   ifeq ($(BOXFAMILY), apollo)
     DRIVERS_DIR          = apollo
@@ -221,7 +219,6 @@ else ifeq ($(BOXSERIES), hd2)
 else ifeq ($(BOXSERIES), hd51)
   KERNEL_VERSION_MAJOR   = 4.10
   KERNEL_VERSION         = 4.10.12
-  KERNEL_VERSION_FULL    = $(KERNEL_VERSION)
 
   DRIVERS_DIR            = hd51
   CORTEX-STRINGS         = -lcortex-strings
@@ -237,7 +234,7 @@ endif
 STATIC_LIB_DIR = $(STATIC_DIR)/lib
 TARGET_BIN_DIR = $(TARGET_DIR)/bin
 TARGET_LIB_DIR = $(TARGET_DIR)/lib
-TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL)
+TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION)
 TARGET_INCLUDE_DIR = $(TARGET_DIR)/include
 
 TARGET_CFLAGS   = -pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)

make/linux-kernel.mk

@@ -10,7 +10,7 @@ KERNEL_SRC		= linux-$(KERNEL_VERSION)
 KERNEL_OBJ		= linux-$(KERNEL_VERSION)-obj
 KERNEL_MODULES		= linux-$(KERNEL_VERSION)-modules
 
-KERNEL_MODULES_DIR	= $(BUILD_TMP)/$(KERNEL_MODULES)/lib/modules/$(KERNEL_VERSION_FULL)
+KERNEL_MODULES_DIR	= $(BUILD_TMP)/$(KERNEL_MODULES)/lib/modules/$(KERNEL_VERSION)
 KERNEL_CONFIG		= $(CONFIGS)/kernel-$(KERNEL_VERSION_MAJOR)-$(BOXFAMILY).config
 
 KERNEL_UIMAGE		= $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/Image
@@ -39,7 +39,7 @@ KERNEL_MAKEVARS := \
 
 # Compatibility variables
 KERNEL_MAKEVARS += \
-	KVER=$(KERNEL_VERSION_FULL) \
+	KVER=$(KERNEL_VERSION) \
 	KSRC=$(BUILD_TMP)/$(KERNEL_SRC)
 
 KERNEL_MAKEOPTS = $(EMPTY)
@@ -152,7 +152,7 @@ kernel-modules-armbox: kernel-armbox
 # -----------------------------------------------------------------------------
 
 depmod:
-	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGET_DIR) $(KERNEL_VERSION_FULL)
+	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGET_DIR) $(KERNEL_VERSION)
 ifeq ($(BOXSERIES), hd1)
 	mv $(TARGET_MODULES_DIR)/modules.dep $(TARGET_MODULES_DIR)/.modules.dep
 	rm $(TARGET_MODULES_DIR)/modules.*

make/rootfs.mk

@@ -106,7 +106,7 @@ ifneq ($(DEBUG), yes)
 			-path $(ROOTFS)/lib/modules \) -prune -o \
 	-type f -print0 | xargs -0 $(TARGET)-strip || true
   ifeq ($(BOXSERIES), hd2)
-	find $(ROOTFS)/lib/modules/$(KERNEL_VERSION_FULL)/kernel -type f -name '*.ko' | xargs -n 1 $(TARGET)-objcopy --strip-unneeded
+	find $(ROOTFS)/lib/modules/$(KERNEL_VERSION)/kernel -type f -name '*.ko' | xargs -n 1 $(TARGET)-objcopy --strip-unneeded
   endif
 	@echo -e "$(TERM_YELLOW)"
 	@du -sh $(ROOTFS)