diff options
author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2005-01-11 16:49:39 +0000 |
---|---|---|
committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2005-01-11 16:49:39 +0000 |
commit | ddfa46ba19e701ab23e00cabfbd157ba55ad83a1 (patch) | |
tree | 4f477e373a045364699ce931118a60ae8c3dffaf | |
parent | 9990bd350d74449b36f009904ec1d34582ef3772 (diff) | |
download | xen-ddfa46ba19e701ab23e00cabfbd157ba55ad83a1.tar.gz xen-ddfa46ba19e701ab23e00cabfbd157ba55ad83a1.tar.bz2 xen-ddfa46ba19e701ab23e00cabfbd157ba55ad83a1.zip |
bitkeeper revision 1.1159.170.87 (41e403a3b9YzrwLBMzUP1m_iQQGMJQ)
Allow building of kernels with no module support.
-rw-r--r-- | buildconfigs/mk.linux-2.6-xen0 | 8 | ||||
-rw-r--r-- | buildconfigs/mk.linux-2.6-xenU | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0 index bb7bf57ec4..82179c6c74 100644 --- a/buildconfigs/mk.linux-2.6-xen0 +++ b/buildconfigs/mk.linux-2.6-xen0 @@ -11,12 +11,14 @@ include buildconfigs/Rules.mk .PHONY: build clean delete +# 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 -# The real action starts here! $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) rm -rf $(LINUX_DIR) cp -al $< $(LINUX_DIR) diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU index 3f3b84b2de..fa6e1109b3 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -13,11 +13,12 @@ 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) rm -rf $(LINUX_DIR) cp -al $< $(LINUX_DIR) |