diff options
| author | Ian Campbell <ian.campbell@xensource.com> | 2007-08-17 16:34:11 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@xensource.com> | 2007-08-17 16:34:11 +0100 |
| commit | 47e2355fc9bb00b311fd64b01497fce16b6ca522 (patch) | |
| tree | 6a686c22324f5f5e04240d9ad94f4f405fb87a1b /buildconfigs | |
| parent | b43bbe7bf06429c5827129dfd216c1c8c07a7755 (diff) | |
| download | xen-47e2355fc9bb00b311fd64b01497fce16b6ca522.tar.gz xen-47e2355fc9bb00b311fd64b01497fce16b6ca522.tar.bz2 xen-47e2355fc9bb00b311fd64b01497fce16b6ca522.zip | |
silentoldconfig seems to break automated testing, try an explicit make prepare
instead.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
Diffstat (limited to 'buildconfigs')
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen index 89b3f02709..25d258de4e 100644 --- a/buildconfigs/mk.linux-2.6-xen +++ b/buildconfigs/mk.linux-2.6-xen @@ -98,12 +98,12 @@ endif ifneq ($(EXTRAVERSION),) echo "$(EXTRAVERSION)" >$(LINUX_DIR)/localversion-xen endif - $(MAKE) -C $(LINUX_SRCDIR) ARCH=$(LINUX_ARCH) silentoldconfig O=$$(/bin/pwd)/$(LINUX_DIR) + $(MAKE) -C $(LINUX_SRCDIR) ARCH=$(LINUX_ARCH) oldconfig O=$$(/bin/pwd)/$(LINUX_DIR) @if [ ! -f $(LINUX_DIR)/Makefile ] ; then \ - echo "*****************************************"; \ - echo "silentoldconfig did not create a Makefile"; \ + echo "***********************************"; \ + echo "oldconfig did not create a Makefile"; \ echo "Generating $(LINUX_DIR)/Makefile "; \ - echo "*****************************************"; \ + echo "***********************************"; \ ( echo "# Automatically generated: don't edit"; \ echo ""; \ echo "VERSION = 2"; \ @@ -125,6 +125,7 @@ endif echo " \$$(MAKE) -C \$$(KERNELSRC) O=\$$(KERNELOUTPUT) \$$@"; \ ) > $(LINUX_DIR)/Makefile ; \ fi + $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) prepare .PHONY: prep prep: $(LINUX_DIR)/include/linux/autoconf.h |