diff options
| author | Khalid Zubair <kzubair@cyngn.com> | 2015-11-18 15:54:40 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-04 11:26:45 -0800 |
| commit | 9a91748c871670d4a6dabf95e6bfe44837687734 (patch) | |
| tree | 0eac76a8b919c851b055373c68fe0c4e871829df /core/tasks | |
| parent | c713d764c53e439352e79076eeecdbed9b2ccd6c (diff) | |
| download | build-9a91748c871670d4a6dabf95e6bfe44837687734.zip build-9a91748c871670d4a6dabf95e6bfe44837687734.tar.gz build-9a91748c871670d4a6dabf95e6bfe44837687734.tar.bz2 | |
kernel: don't build modules or dtbs unless enabled
Build modules and dtbs only if enabled. The make commands were allowed to
fail silently to support builds that did not have these options
enabled.
This had a side effect of allowing builds to complete even if modules
failed to build. Don't suppress these error anymore.
Change-Id: I842124b465d9e14edd6a09ffe54f09da32f10632
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/kernel.mk | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index d1d24d6..140964c 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -230,12 +230,26 @@ $(KERNEL_CONFIG): $(KERNEL_OUT) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi TARGET_KERNEL_BINARIES: $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL) + @echo -e ${CL_GRN}"Building Kernel"${CL_RST} $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE) - -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) dtbs - -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules - -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules_install - $(mv-modules) - $(clean-module-folder) + $(hide) if grep -q 'CONFIG_OF=y' $(KERNEL_CONFIG) ; \ + then \ + echo -e ${CL_GRN}"Building DTBs"${CL_RST} ; \ + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) dtbs ; \ + else \ + echo "DTBs not enabled" ; \ + fi ; + $(hide) if grep -q 'CONFIG_MODULES=y' $(KERNEL_CONFIG) ; \ + then \ + echo -e ${CL_GRN}"Building Kernel Modules"${CL_RST} ; \ + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules && \ + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules_install && \ + $(mv-modules) && \ + $(clean-module-folder) ; \ + else \ + echo "Kernel Modules not enabled" ; \ + fi ; + $(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES |