ia64/xen-unstable

changeset 3497:59cd0bf0ef3b

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 <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
author iap10@labyrinth.cl.cam.ac.uk
date Sat Jan 22 21:52:47 2005 +0000 (2005-01-22)
parents 5d3cf5e4272d
children 1d24a5b0b338
files buildconfigs/mk.linux-2.4-xen0 buildconfigs/mk.linux-2.4-xenU
line diff
     1.1 --- a/buildconfigs/mk.linux-2.4-xen0	Sat Jan 22 21:47:15 2005 +0000
     1.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Sat Jan 22 21:52:47 2005 +0000
     1.3 @@ -13,8 +13,10 @@ include buildconfigs/Rules.mk
     1.4  
     1.5  # The real action starts here!
     1.6  build: $(LINUX_DIR)/include/linux/autoconf.h
     1.7 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
     1.8 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
     1.9 +	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
    1.10 +	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
    1.11 +	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \
    1.12 +	fi
    1.13  	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    1.14  
    1.15  patches/tmp/ebtables.diff:
     2.1 --- a/buildconfigs/mk.linux-2.4-xenU	Sat Jan 22 21:47:15 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Sat Jan 22 21:52:47 2005 +0000
     2.3 @@ -13,8 +13,10 @@ include buildconfigs/Rules.mk
     2.4  
     2.5  # The real action starts here!
     2.6  build: $(LINUX_DIR)/include/linux/autoconf.h
     2.7 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules	
     2.8 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
     2.9 +	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
    2.10 +	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
    2.11 +	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \
    2.12 +	fi
    2.13  	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    2.14  
    2.15  $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)