aboutsummaryrefslogtreecommitdiffstats
path: root/buildconfigs
diff options
context:
space:
mode:
Diffstat (limited to 'buildconfigs')
-rw-r--r--buildconfigs/mk.linux-2.6-common4
1 files changed, 3 insertions, 1 deletions
diff --git a/buildconfigs/mk.linux-2.6-common b/buildconfigs/mk.linux-2.6-common
index 05847e9731..6561e4e439 100644
--- a/buildconfigs/mk.linux-2.6-common
+++ b/buildconfigs/mk.linux-2.6-common
@@ -75,7 +75,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: $(LINUX_SRCDIR)/.valid-src
# tree. Finally attempt to use make defconfig.
set -e ; \
CONFIG_VERSION=$$(sed -ne 's/$$(XENGUEST)//; s/^EXTRAVERSION = //p' $(LINUX_SRCDIR)/Makefile); \
- if [ -r $(DESTDIR)/boot/config-$(LINUX_VER3)$$CONFIG_VERSION$(EXTRAVERSION) ] ; then \
+ if [ ! -z "$(XEN_LINUX_CONFIG)" -a -r $(XEN_LINUX_CONFIG) ]; then \
+ cp $(XEN_LINUX_CONFIG) $(CONFIG_FILE); \
+ elif [ -r $(DESTDIR)/boot/config-$(LINUX_VER3)$$CONFIG_VERSION$(EXTRAVERSION) ] ; then \
cp $(DESTDIR)/boot/config-$(LINUX_VER3)$$CONFIG_VERSION$(EXTRAVERSION) $(CONFIG_FILE) ; \
elif [ -e $(LINUX_SRCDIR)/buildconfigs/create_config.sh ] ; then \
cd $(LINUX_SRCDIR) && sh buildconfigs/create_config.sh \