diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-01 20:32:27 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-01 20:32:27 +0200 |
| commit | 8fae160a111d14f07462936354b23a8b32939a83 (patch) | |
| tree | 8e4904b4dcc5dded98eaa176ed26055885f729a2 /mk | |
| parent | 3c85cd7e7af49e6d674fd3b7c5171425ee227965 (diff) | |
| download | embtoolkit-8fae160a111d14f07462936354b23a8b32939a83.tar.gz embtoolkit-8fae160a111d14f07462936354b23a8b32939a83.tar.bz2 embtoolkit-8fae160a111d14f07462936354b23a8b32939a83.tar.xz | |
Build system: linux image build tweak to use common LINUX_MAKE_OPTS
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/linux.mk | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/mk/linux.mk b/mk/linux.mk index 5415cbb..44a06f7 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -47,15 +47,18 @@ LINUX_HEADERS_SRC_DIR := $(LINUX_SRC_DIR) LINUX_HEADERS_BUILD_DIR := $(LINUX_BUILD_DIR) LINUX_HEADERS_KCONFIGS_NAME := LINUX +LINUX_MAKE_OPTS := quiet=quiet_ +LINUX_MAKE_OPTS += ARCH=$(LINUX_ARCH) +LINUX_MAKE_OPTS += CROSS_COMPILE=$(CROSS_COMPILE_CACHED) + define __embtk_install_linux_headers $(call embtk_pinfo,"Installing linux-$(LINUX_VERSION) headers...") $(call embtk_download_pkg,linux) $(call embtk_decompress_pkg,linux) - $(Q)PATH=$(PATH):$(embtk_tools)/bin/ $(MAKE) -C $(LINUX_BUILD_DIR) \ - headers_install ARCH=$(LINUX_ARCH) \ - CROSS_COMPILE=$(STRICT_GNU_TARGET)- \ - INSTALL_HDR_PATH=$(embtk_sysroot)/usr + $(MAKE) -C $(LINUX_BUILD_DIR) $(LINUX_MAKE_OPTS) \ + INSTALL_HDR_PATH=$(embtk_sysroot)/usr headers_install touch $(call __embtk_pkg_dotinstalled_f,linux_headers) + $(call __embtk_pkg_gen_dotkconfig_f,linux_headers) endef define embtk_install_linux_headers [ -e $(call __embtk_pkg_dotinstalled_f,linux_headers) ] || \ @@ -65,17 +68,11 @@ endef # # linux install macros # + __embtk_linux_dotconfig_f := $(call __embtk_mk_uquote,$(CONFIG_EMBTK_LINUX_DOTCONFIG)) __embtk_linux_srcdir := $(call __embtk_mk_uquote,$(or $(CONFIG_EMBTK_LINUX_BUILD_EXTSRC),$(LINUX_SRC_DIR))) __embtk_linux_support_modules := $(shell grep MODULES=y "$(__embtk_linux_dotconfig_f)" 2>/dev/null) -define __embtk_install_linux_modules - $(MAKE) -C $(__embtk_linux_srcdir) quiet=quiet_ \ - INSTALL_MOD_PATH=$(embtk_rootfs) \ - ARCH=$(LINUX_ARCH) \ - CROSS_COMPILE=$(CROSS_COMPILE_CACHED) modules_install -endef - define __embtk_install_linux_check_config if [ "x" = "x$(__embtk_linux_dotconfig_f)" ]; then \ $(call embtk_perror,"Unable to build linux kernel image: no config file");\ @@ -106,30 +103,23 @@ define __embtk_install_linux $(if $(CONFIG_EMBTK_LINUX_BUILD_TOOLCHAIN_SRC), $(call embtk_download_pkg,linux) $(call embtk_decompress_pkg,linux)) - $(MAKE) -C $(__embtk_linux_srcdir) \ - ARCH=$(LINUX_ARCH) \ - CROSS_COMPILE=$(CROSS_COMPILE_CACHED) distclean - rm -rf $(__embtk_linux_srcdir)/.config + $(MAKE) -C $(__embtk_linux_srcdir) $(LINUX_MAKE_OPTS) distclean cp $(CONFIG_EMBTK_LINUX_DOTCONFIG) $(__embtk_linux_srcdir)/.config - $(MAKE) -C $(__embtk_linux_srcdir) quiet=quiet_ \ - ARCH=$(LINUX_ARCH) \ - CROSS_COMPILE=$(CROSS_COMPILE_CACHED) silentoldconfig - $(MAKE) -C $(__embtk_linux_srcdir) quiet=quiet_ \ - ARCH=$(LINUX_ARCH) \ - CROSS_COMPILE=$(CROSS_COMPILE_CACHED) $(J) + $(MAKE) -C $(__embtk_linux_srcdir) $(LINUX_MAKE_OPTS) silentoldconfig + $(MAKE) -C $(__embtk_linux_srcdir) $(LINUX_MAKE_OPTS) $(J) touch $(call __embtk_pkg_dotinstalled_f,linux) $(call __embtk_pkg_gen_dotkconfig_f,linux) endef define embtk_install_linux $(if $(call __embtk_pkg_installed-y,linux),true,$(__embtk_install_linux)) - $(if $(__embtk_linux_support_modules), - $(embtk_postinstall_linux)) + $(if $(__embtk_linux_support_modules),$(embtk_postinstall_linux)) endef define embtk_postinstall_linux $(call embtk_pinfo,"Install linux kernel modules...") - $(__embtk_install_linux_modules) + $(MAKE) -C $(__embtk_linux_srcdir) $(LINUX_MAKE_OPTS) \ + INSTALL_MOD_PATH=$(embtk_rootfs) modules_install endef # |