mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
bitkeeper revision 1.1389.1.51 (428379b5QDaS6ue4t6H9hMTIZ0L7Yw)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean
This commit is contained in:
cl349@firebug.cl.cam.ac.uk committed
commit
6f8b0f05bc
4 files changed
+16
-20
No files matched your search
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.4
|
||||
|
||||
EXTRAVERSION = xen0
|
||||
|
||||
FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION)
|
||||
|
||||
LINUX_DIR = $(OS)-$(FULLVERSION)
|
||||
LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
|
||||
|
||||
include buildconfigs/Rules.mk
|
||||
|
||||
@@ -39,8 +37,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
|
||||
# add ebtables patch
|
||||
( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
|
||||
# Re-use config from install dir if one exits else use default config
|
||||
[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
|
||||
cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
|
||||
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
|
||||
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
|
||||
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
|
||||
|| cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
|
||||
$(LINUX_DIR)/.config
|
||||
make -C $(LINUX_DIR) ARCH=xen oldconfig
|
||||
|
||||
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.4
|
||||
|
||||
EXTRAVERSION = xenU
|
||||
|
||||
FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION)
|
||||
|
||||
LINUX_DIR = $(OS)-$(FULLVERSION)
|
||||
LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
|
||||
|
||||
include buildconfigs/Rules.mk
|
||||
|
||||
@@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)
|
||||
sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
|
||||
rm -f Makefile ; mv Mk.tmp Makefile )
|
||||
# Re-use config from install dir if one exits else use default config
|
||||
[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
|
||||
cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
|
||||
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
|
||||
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
|
||||
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
|
||||
|| cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
|
||||
$(LINUX_DIR)/.config
|
||||
make -C $(LINUX_DIR) ARCH=xen oldconfig
|
||||
|
||||
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.6
|
||||
|
||||
EXTRAVERSION = xen0
|
||||
|
||||
FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION)
|
||||
|
||||
LINUX_DIR = $(OS)-$(FULLVERSION)
|
||||
LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
|
||||
|
||||
include buildconfigs/Rules.mk
|
||||
|
||||
@@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
|
||||
sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
|
||||
rm -f Makefile ; mv Mk.tmp Makefile )
|
||||
# Re-use config from install dir if one exits else use default config
|
||||
[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
|
||||
cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
|
||||
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
|
||||
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
|
||||
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
|
||||
|| cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
|
||||
$(LINUX_DIR)/.config
|
||||
$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
|
||||
|
||||
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.6
|
||||
|
||||
EXTRAVERSION = xenU
|
||||
|
||||
FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION)
|
||||
|
||||
LINUX_DIR = $(OS)-$(FULLVERSION)
|
||||
LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
|
||||
|
||||
include buildconfigs/Rules.mk
|
||||
|
||||
@@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
|
||||
sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
|
||||
rm -f Makefile ; mv Mk.tmp Makefile )
|
||||
# Re-use config from install dir if one exits else use default config
|
||||
[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
|
||||
cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
|
||||
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
|
||||
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
|
||||
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
|
||||
|| cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
|
||||
$(LINUX_DIR)/.config
|
||||
$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
|
||||
|
||||