From 516019713c0ad2d3119d560f8f83200c5fd48d7b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 13 Feb 2019 23:49:58 +0100 Subject: [PATCH] - introduce KERNEL_MAKEVARS variable --- make/kernel-armbox.mk | 17 ++++++++++++----- make/kernel-coolstream.mk | 23 +++++++++++++++-------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/make/kernel-armbox.mk b/make/kernel-armbox.mk index b4b00c7a..627cf025 100644 --- a/make/kernel-armbox.mk +++ b/make/kernel-armbox.mk @@ -8,6 +8,13 @@ ZIMAGE = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/$(BOXARCH)/boot/zImage ZIMAGE_DTB = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/$(BOXARCH)/boot/zImage_DTB MODULES_DIR = $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_VERSION_FULL) +KERNEL_MAKEVARS := \ + ARCH=$(BOXARCH) \ + CROSS_COMPILE=$(TARGET)- \ + INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules + +# ----------------------------------------------------------------------------- + $(D)/kernel-armbox: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) $(REMOVE)/linux-$(KERNEL_VERSION) cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL); \ @@ -19,12 +26,12 @@ $(D)/kernel-armbox: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) touch .scmversion; \ cp $(CONFIGS)/kernel-$(KERNEL_VERSION_MAJOR)-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config; \ $(MKDIR)/linux-$(KERNEL_VERSION)-modules; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules $(DTB_VER); \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage; \ + $(MAKE) $(KERNEL_MAKEVARS) silentoldconfig; \ + $(MAKE) $(KERNEL_MAKEVARS) $(DTB_VER); \ + $(MAKE) $(KERNEL_MAKEVARS) zImage; \ cat $(ZIMAGE) $(DTB) > $(ZIMAGE_DTB); \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install + $(MAKE) $(KERNEL_MAKEVARS) modules; \ + $(MAKE) $(KERNEL_MAKEVARS) modules_install $(TOUCH) kernel-armbox-modules: $(D)/kernel-armbox diff --git a/make/kernel-coolstream.mk b/make/kernel-coolstream.mk index 52fa7e5e..f7b0ede7 100644 --- a/make/kernel-coolstream.mk +++ b/make/kernel-coolstream.mk @@ -14,6 +14,13 @@ else KERNEL_DESTDIR = $(SKEL_ROOT)/var/update endif +KERNEL_MAKEVARS := \ + ARCH=$(BOXARCH) \ + CROSS_COMPILE=$(TARGET)- \ + INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules + +# ----------------------------------------------------------------------------- + kernel-coolstream: kernel-coolstream-$(BOXSERIES) kernel-coolstream-install: kernel-coolstream-install-$(BOXSERIES) @@ -53,10 +60,10 @@ $(D)/kernel-coolstream-hd2: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) $(SOURCE_DIR)/$(NI_ cp $(CONFIGS)/kernel-$(KERNEL_VERSION_MAJOR)-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config; \ sed -i -e 's/SUBLEVEL = 108/SUBLEVEL = 93/g' Makefile; \ $(MKDIR)/linux-$(KERNEL_VERSION)-modules; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install; \ + $(MAKE) $(KERNEL_MAKEVARS) silentoldconfig; \ + $(MAKE) $(KERNEL_MAKEVARS) zImage; \ + $(MAKE) $(KERNEL_MAKEVARS) modules; \ + $(MAKE) $(KERNEL_MAKEVARS) modules_install; \ cat $(ZIMAGE) $(DTB) > zImage_DTB; \ mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d zImage_DTB $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz ifeq ($(BOXFAMILY), apollo) @@ -83,10 +90,10 @@ $(D)/kernel-coolstream-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) cp $(CONFIGS)/kernel-$(KERNEL_VERSION_MAJOR)-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config; \ sed -i -e 's/EXTRAVERSION = .15/EXTRAVERSION = .13/g' Makefile; \ $(MKDIR)/linux-$(KERNEL_VERSION)-modules; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules; \ - $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install; \ + $(MAKE) $(KERNEL_MAKEVARS) silentoldconfig; \ + $(MAKE) $(KERNEL_MAKEVARS) zImage; \ + $(MAKE) $(KERNEL_MAKEVARS) modules; \ + $(MAKE) $(KERNEL_MAKEVARS) modules_install; \ mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(IMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img; \ mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(TOUCH)