Gitiles
Code Review Sign In
review.blissroms.org / treble_patches / a76b726775ebda9724ee0788ddf6d60a7044901f / . / patches / vendor / bliss / 0011-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch
blob: 3bcb5da397288adc7622d56a8117e081d2f7954a [file] [log] [blame]
Jackeaglea76b7262019-05-03 14:53:47 +0200[diff] [blame^]1From 9afa3ceca47aa1db7f1f2a661d6c75fac6631a27 Mon Sep 17 00:00:00 2001
2From: Jackeagle <jackeagle102@gmail.com>
3Date: Fri, 3 May 2019 14:49:33 +0200
4Subject: [PATCH 11/17] Revert "kernel: Use a macro for kernel build targets"
5
6This reverts commit 50ec7ed057150c875342d461d34fe2cc02dea12d.
7---
8 build/tasks/kernel.mk | 49 +++++++++++++------------------------------
9 1 file changed, 14 insertions(+), 35 deletions(-)
10
11diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
12index d1862031..5df1ec54 100644
13--- a/build/tasks/kernel.mk
14+++ b/build/tasks/kernel.mk
15@@ -199,25 +199,6 @@ endif
16
17 KERNEL_ADDITIONAL_CONFIG_OUT := $(KERNEL_OUT)/.additional_config
18
19-# Internal implementation of make-kernel-target
20-# $(1): output path (The value passed to O=)
21-# $(2): target to build (eg. defconfig, modules, dtbo.img)
22-define internal-make-kernel-target
23-$(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(1) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(2)
24-endef
25-
26-# Make a kernel target
27-# $(1): The kernel target to build (eg. defconfig, modules, modules_install)
28-define make-kernel-target
29-$(call internal-make-kernel-target,$(KERNEL_OUT),$(1))
30-endef
31-
32-# Make a DTBO target
33-# $(1): The DTBO target to build (eg. dtbo.img, defconfig)
34-define make-dtbo-target
35-$(call internal-make-kernel-target,$(PRODUCT_OUT)/dtbo,$(1))
36-endef
37-
38 .PHONY: force_additional_config
39 $(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config
40 $(hide) cmp -s $(KERNEL_ADDITIONAL_CONFIG_SRC) $@ || cp $(KERNEL_ADDITIONAL_CONFIG_SRC) $@;
41@@ -225,31 +206,29 @@ $(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config
42 $(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)
43 @echo "Building Kernel Config"
44 $(hide) mkdir -p $(KERNEL_OUT)
45- $(call make-kernel-target,VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG))
46+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG)
47 $(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
48 echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
49 echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
50- $(call make-kernel-target,oldconfig); \
51- fi
52+ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) oldconfig; fi
53 # Create defconfig build artifact
54- $(call make-kernel-target,savedefconfig)
55+ $(hide) $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) savedefconfig
56 $(hide) if [ ! -z "$(KERNEL_ADDITIONAL_CONFIG)" ]; then \
57 echo "Using additional config '$(KERNEL_ADDITIONAL_CONFIG)'"; \
58 $(KERNEL_SRC)/scripts/kconfig/merge_config.sh -m -O $(KERNEL_OUT) $(KERNEL_OUT)/.config $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_ADDITIONAL_CONFIG); \
59- $(call make-kernel-target,KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig); \
60- fi
61+ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi
62
63 .PHONY: TARGET_KERNEL_BINARIES
64 TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
65 @echo "Building Kernel"
66- $(call make-kernel-target,$(BOARD_KERNEL_IMAGE_NAME))
67+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(BOARD_KERNEL_IMAGE_NAME)
68 $(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \
69 echo "Building DTBs"; \
70- $(call make-kernel-target,dtbs); \
71+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbs; \
72 fi
73 $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
74 echo "Building Kernel Modules"; \
75- $(call make-kernel-target,modules); \
76+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) modules; \
77 fi
78
79 .PHONY: INSTALLED_KERNEL_MODULES
80@@ -259,7 +238,7 @@ INSTALLED_KERNEL_MODULES: depmod-host
81 $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
82 $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
83 echo "Installing Kernel Modules"; \
84- $(call make-kernel-target,INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install) && \
85+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install && \
86 mofile=$$(find $(KERNEL_MODULES_OUT) -type f -name modules.order) && \
87 mpath=$$(dirname $$mofile) && \
88 for f in $$(find $$mpath/kernel -type f -name '*.ko'); do \
89@@ -327,7 +306,7 @@ $(KERNEL_HEADERS_INSTALL_DIR): $(KERNEL_HEADERS_INSTALL_DEPS)
90 .PHONY: kerneltags
91 kerneltags: $(KERNEL_CONFIG)
92 $(hide) mkdir -p $(KERNEL_OUT)
93- $(call make-kernel-target,tags)
94+ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) tags
95
96 .PHONY: kernelconfig kernelxconfig kernelsavedefconfig alldefconfig
97
98@@ -344,21 +323,21 @@ kernelxconfig kernelconfig:
99
100 kernelsavedefconfig:
101 $(hide) mkdir -p $(KERNEL_OUT)
102- $(call make-kernel-target,$(KERNEL_DEFCONFIG))
103+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_DEFCONFIG)
104 env KCONFIG_NOTIMESTAMP=true \
105- $(call make-kernel-target,savedefconfig)
106+ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) savedefconfig
107 cp $(KERNEL_OUT)/defconfig $(KERNEL_DEFCONFIG_SRC)
108
109 alldefconfig:
110 $(hide) mkdir -p $(KERNEL_OUT)
111 env KCONFIG_NOTIMESTAMP=true \
112- $(call make-kernel-target,alldefconfig)
113+ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) alldefconfig
114
115 TARGET_PREBUILT_DTBO = $(PRODUCT_OUT)/dtbo/arch/$(KERNEL_ARCH)/boot/dtbo.img
116 $(TARGET_PREBUILT_DTBO): $(AVBTOOL)
117 echo -e ${CL_GRN}"Building DTBO.img"${CL_RST}
118- $(call make-dtbo-target,$(KERNEL_DEFCONFIG))
119- $(call make-dtbo-target,dtbo.img)
120+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_DEFCONFIG)
121+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbo.img
122 $(AVBTOOL) add_hash_footer \
123 --image $@ \
124 --partition_size $(BOARD_DTBOIMG_PARTITION_SIZE) \
125--
1262.21.0
127