From 7f493a93051f8c2bf8700f084dfb812fcec56305 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Sat, 22 Jan 2005 21:52:47 +0000 Subject: bitkeeper revision 1.1159.223.24 (41f2cb2floBkEBE6cfn2iLK2ZpPfhA) Description: conditionally call modules targets for 2.4 There was a complaint on the mailing list about linux 2.6 not building if module support was disabled; a patch was done to fix this. However, the same change was not done to the 2.4 files. From: Adam Heath Signed-off-by: ian.pratt@cl.cam.ac.uk --- buildconfigs/mk.linux-2.4-xen0 | 6 ++++-- buildconfigs/mk.linux-2.4-xenU | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'buildconfigs') diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0 index b9f852eff8..e4a4537bc5 100644 --- a/buildconfigs/mk.linux-2.4-xen0 +++ b/buildconfigs/mk.linux-2.4-xen0 @@ -13,8 +13,10 @@ include buildconfigs/Rules.mk # The real action starts here! build: $(LINUX_DIR)/include/linux/autoconf.h - $(MAKE) -C $(LINUX_DIR) ARCH=xen modules - $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install + if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \ + $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \ + $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \ + fi $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install patches/tmp/ebtables.diff: diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU index a0937de4f6..86d38bb9d5 100644 --- a/buildconfigs/mk.linux-2.4-xenU +++ b/buildconfigs/mk.linux-2.4-xenU @@ -13,8 +13,10 @@ include buildconfigs/Rules.mk # The real action starts here! build: $(LINUX_DIR)/include/linux/autoconf.h - $(MAKE) -C $(LINUX_DIR) ARCH=xen modules - $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install + if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \ + $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \ + $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \ + fi $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) -- cgit v1.2.3