From 4a24aa0ef74788650019b7d94dd0483201bf5a2d Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sun, 27 Mar 2016 16:43:57 +0200
Subject: [PATCH] bootstrap.mk: fix copy of drivers for apollo/kronos

---
 Makefile             |  2 +-
 make/bootstrap.mk    | 30 +++++-------------------------
 make/cleantargets.mk |  8 +-------
 make/environment.mk  |  4 ++++
 4 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index b97466b..a70f0a3 100755
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ bootstrap:
 includes-and-libs:
 	$(MAKE) $(TARGETPREFIX)/lib $(TARGETPREFIX)/lib/firmware
 modules:
-	$(MAKE) $(TARGETPREFIX)/lib/modules
+	$(MAKE) $(TARGETPREFIX)/lib/modules/$(KVERSION_FULL)
 
 # post customize
 post-customize: $(BASE_DIR)/customize/post-customize.sh
diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 705937a..da5664a 100755
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -72,35 +72,15 @@ $(HOSTPREFIX)/bin: $(HOSTPREFIX)
 
 $(TARGETPREFIX)/lib: | $(TARGETPREFIX)
 	mkdir -p $@
-	if [ $(PLATFORM) = "apollo" ]; then \
-		cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/libs/* $@/; \
-	elif [ $(PLATFORM) = "kronos" ]; then \
-		cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/libs/* $@/; \
-	else \
-		cp -a $(SOURCE_DIR)/git/DRIVERS/nevis/libs/* $@/; \
-	fi
+	cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/libs/* $@/
 
 $(TARGETPREFIX)/lib/firmware: | $(TARGETPREFIX)
 	mkdir -p $@
-	if [ $(PLATFORM) = "apollo" ]; then \
-		cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/firmware/* $@/; \
-	elif [ $(PLATFORM) = "kronos" ]; then \
-		cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/firmware/* $@/; \
-	else \
-		cp -a $(SOURCE_DIR)/git/DRIVERS/nevis/firmware/* $@/; \
-	fi
+	cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/firmware/* $@/
 
-$(TARGETPREFIX)/lib/modules: | $(TARGETPREFIX)
+$(TARGETPREFIX)/lib/modules/$(KVERSION_FULL): | $(TARGETPREFIX)
 	mkdir -p $@
-	if [ $(PLATFORM) = "apollo" ]; then \
-		cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/drivers/$(CST_KERNEL_VERSION)/* $@/; \
-	elif [ $(PLATFORM) = "kronos" ]; then \
-		cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/drivers/$(CST_KERNEL_VERSION)/* $@/; \
-	else \
-		rm -fr $(TARGETPREFIX)/lib/modules/$(CST_KERNEL_VERSION)-nevis; \
-		mkdir -p $(TARGETPREFIX)/lib/modules/$(CST_KERNEL_VERSION)-nevis; \
-		cp $(SOURCE_DIR)/git/DRIVERS/nevis/drivers/$(CST_KERNEL_VERSION)-nevis/* $(TARGETPREFIX)/lib/modules/$(CST_KERNEL_VERSION)-nevis/; \
-	fi
+	cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/drivers/$(KVERSION_FULL)/* $@/
 
 $(TARGETPREFIX)/lib/libc.so.6: | $(TARGETPREFIX)
 	if test -e $(CROSS_DIR)/$(TARGET)/sys-root/lib; then \
@@ -123,6 +103,6 @@ $(ARCHIVE):
 # hack to make sure they are always copied
 PHONY += $(TARGETPREFIX)/lib
 PHONY += $(TARGETPREFIX)/lib/firmware
-PHONY += $(TARGETPREFIX)/lib/modules
+PHONY += $(TARGETPREFIX)/lib/modules/$(KVERSION_FULL)
 PHONY += $(TARGETPREFIX)/lib/libc.so.6
 PHONY += targetprefix skeleton
diff --git a/make/cleantargets.mk b/make/cleantargets.mk
index 986f7ba..a737a1b 100755
--- a/make/cleantargets.mk
+++ b/make/cleantargets.mk
@@ -40,13 +40,7 @@ neutrino-clean:
 	-make -C $(N_OBJDIR) uninstall distclean
 	-rm -rf $(BUILD_TMP)/neutrino-hd
 	-rm -rf $(BUILD_TMP)/rootfs
-	if [ $(PLATFORM) = "apollo" ]; then \
-		rm -f $(D)/neutrino-hd-apollo; \
-	elif [ $(PLATFORM) = "kronos" ]; then \
-		rm -f $(D)/neutrino-hd-kronos; \
-	else \
-		rm -f $(D)/neutrino-hd-nevis; \
-	fi
+	-rm -rf $(D)/neutrino-hd
 
 rootfs-clean:
 	-rm -rf $(BUILD_TMP)/rootfs
diff --git a/make/environment.mk b/make/environment.mk
index 789fe30..c15ad6d 100755
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -51,18 +51,21 @@ ifeq ($(BOXMODEL), $(filter $(BOXMODEL), zee2 link))
   PLATFORM            = kronos
   DRIVER_DIR         ?= $(PLATFORM)-3.x
   CST_KERNEL_VERSION ?= 3.10.70
+  KVERSION_FULL       = $(CST_KERNEL_VERSION)
   KBRANCH            ?= cst_3.10 
 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), tank trinity))
   TARGET             ?= arm-cortex-linux-uclibcgnueabi
   PLATFORM            = apollo
   DRIVER_DIR         ?= $(PLATFORM)-3.x
   CST_KERNEL_VERSION ?= 3.10.70
+  KVERSION_FULL       = $(CST_KERNEL_VERSION)
   KBRANCH            ?= cst_3.10
 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), neo zee))
   TARGET             ?= arm-cx2450x-linux-gnueabi
   PLATFORM            = nevis
   DRIVER_DIR         ?= $(PLATFORM)
   CST_KERNEL_VERSION ?= 2.6.34.13
+  KVERSION_FULL       = $(CST_KERNEL_VERSION)-nevis
   KBRANCH            ?= $(CST_KERNEL_VERSION)-cnxt
 else
   BOXMODEL            = neo
@@ -70,6 +73,7 @@ else
   PLATFORM            = nevis
   DRIVER_DIR         ?= $(PLATFORM)
   CST_KERNEL_VERSION ?= 2.6.34.13
+  KVERSION_FULL       = $(CST_KERNEL_VERSION)-nevis
   KBRANCH            ?= $(CST_KERNEL_VERSION)-cnxt
 endif
 
-- 
2.39.5