From fa352ecfe86684d20c070e4b5a8852aba119112e Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Fri, 31 May 2019 11:55:53 +0200
Subject: [PATCH] - kernel/nevis: remove LOCALVERSION; replaced by softlink

---
 archive-configs/kernel-2.6.34-nevis.config | 2 +-
 make/bootstrap.mk                          | 3 +++
 make/environment-build.mk                  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/archive-configs/kernel-2.6.34-nevis.config b/archive-configs/kernel-2.6.34-nevis.config
index a3d56b4a..e7a14148 100644
--- a/archive-configs/kernel-2.6.34-nevis.config
+++ b/archive-configs/kernel-2.6.34-nevis.config
@@ -29,7 +29,7 @@ CONFIG_CONSTRUCTORS=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION="-nevis"
+CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZO=y
diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index efe995aa..12f89882 100644
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -107,6 +107,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) $@
+ifeq ($(BOXMODEL), nevis)
+	ln -sf $(KERNEL_VERSION_FULL) $@/$(KERNEL_VERSION_FULL)-$(BOXMODEL)
+endif
 
 $(STATIC_LIB_DIR): | $(TARGET_DIR)
 	mkdir -p $@
diff --git a/make/environment-build.mk b/make/environment-build.mk
index 5f3db614..7b0490c9 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -183,7 +183,7 @@ DEBUG ?= no
 ifeq ($(BOXSERIES), hd1)
   KERNEL_VERSION_MAJOR   = 2.6.34
   KERNEL_VERSION         = 2.6.34.13
-  KERNEL_VERSION_FULL    = $(KERNEL_VERSION)-$(BOXMODEL)
+  KERNEL_VERSION_FULL    = $(KERNEL_VERSION)
 
   DRIVERS_DIR            = nevis
   CORTEX-STRINGS         =