From 705b56d42bc8cb5092040a5eb689352a16ca3d39 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Tue, 7 Feb 2017 11:29:39 -0500 Subject: [PATCH] Makefile: Re-order the linux dependencies to pick up on config changes. Signed-off-by: Konrad Rzeszutek Wilk --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9f09e98..e9788e1 100644 --- a/Makefile +++ b/Makefile @@ -85,8 +85,8 @@ linux-DISTRIB_TARGET=dist/common/vmlinuz NCPUS := $(shell grep processor /proc/cpuinfo | wc -l) -.PHONY: linux-dist-nodep -linux-dist-nodep: linux-config +.PHONY: linux-kernel +linux-kernel: linux-config ifeq ($(OLDSTYLE),1) $(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) vmlinuz $(INSTALL_DIR) dist/common/ @@ -98,7 +98,7 @@ else endif .PHONY: linux-dist -linux-dist: linux-dist-nodep +linux-dist: linux-kernel $(LINUX_DST)/usr/gen_init_cpio: $(MAKE) -C $(LINUX_SRC) O=$(LINUX_DST) usr @@ -116,7 +116,7 @@ $(LINUX_DST)/.config: linux.config yes "" | $(MAKE) -C $(LINUX_SRC) O=$(LINUX_DST) oldconfig .PHONY: linux-modules -linux-modules: linux-config +linux-modules: linux-config linux-kernel @mkdir -p $(LINUX_DST)/modulespace $(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) modules $(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) \ @@ -190,7 +190,7 @@ endif IOEMU_DIR = ioemu-remote .PHONY: xen-tools -xen-tools: +xen-tools: xen-hypervisor # $(MAKE) -C xen dist-misc -j$$(($(NCPUS) * 2)) if [ -e xen/tools/firmware/seabios-dir ]; then \ $(MAKE) -C xen/tools/firmware/seabios-dir defconfig; \ @@ -229,7 +229,6 @@ xen-distclean: xen-clean ##################################################################### root_image-DISTRIB_TARGET = dist/common/initramfs.cpio.gz -DOM0_DEP_LIST = linux-modules .PHONY: root_image-dist-nodep @@ -239,7 +238,7 @@ root_image-dist-nodep: $(LINUX_SRC)/usr/gen_init_cpio $(INSTALL_DATA) root_image/dist/common/initramfs.cpio.gz dist/common/ .PHONY: root_image-dist xen-dist linux-dist -root_image-dist: $(DOM0_DEP_LIST) +root_image-dist: linux-modules $(MAKE) root_image-dist-nodep .PHONY: root_image-clean -- 2.39.5