diff options
| author | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-07-14 10:12:51 +0000 |
|---|---|---|
| committer | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-07-14 10:12:51 +0000 |
| commit | dc2e8743997302eeefbdb96361305cda45c0cb3d (patch) | |
| tree | 4a4df64e9814eec867cb15cd2197d5c5232a3b76 | |
| parent | 25de1f6920591b8240649028fc3fd755140f29f6 (diff) | |
| download | xen-dc2e8743997302eeefbdb96361305cda45c0cb3d.tar.gz xen-dc2e8743997302eeefbdb96361305cda45c0cb3d.tar.bz2 xen-dc2e8743997302eeefbdb96361305cda45c0cb3d.zip | |
Misc fixes for new sparse tree names: xen-clone script; -xen kernel build (the one with all the modules); Backout changes to legacy targets.
Signed-off-by: ian.pratt@cl.cam.ac.uk
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen | 3 | ||||
| -rwxr-xr-x | tools/misc/xen-clone | 2 |
3 files changed, 5 insertions, 4 deletions
@@ -181,10 +181,10 @@ uninstall: # Legacy targets for compatibility linux24: - $(MAKE) 'KERNELS=linux-2.4-xen0 linux-2.4-xenU' kernels + $(MAKE) 'KERNELS=linux-2.4*' kernels linux26: - $(MAKE) 'KERNELS=linux-2.6-xen0 linux-2.6-xenU' kernels + $(MAKE) 'KERNELS=linux-2.6*' kernels netbsd20: $(MAKE) netbsd-2.0-xenU-build diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen index 23f8583782..310dc27c28 100644 --- a/buildconfigs/mk.linux-2.6-xen +++ b/buildconfigs/mk.linux-2.6-xen @@ -2,6 +2,7 @@ OS = linux LINUX_SERIES = 2.6 +LINUX_VER = 2.6.12 EXTRAVERSION = xen @@ -23,7 +24,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref rm -rf $(LINUX_DIR) cp -al $(<D) $(LINUX_DIR) # Apply arch-xen patches - ( cd linux-$(LINUX_VER)-xen-sparse ; \ + ( cd linux-$(LINUX_SERIES)-xen-sparse ; \ ./mkbuildtree ../$(LINUX_DIR) ) # Re-use config from install dir if one exits else use default config CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \ diff --git a/tools/misc/xen-clone b/tools/misc/xen-clone index 581a0b9f4e..2d0bea66ae 100755 --- a/tools/misc/xen-clone +++ b/tools/misc/xen-clone @@ -60,7 +60,7 @@ cd ${TOP} fi -if [ -d ${DEST_BK_REP}/linux-2.4.*-xen-sparse ] +if [ -d ${DEST_BK_REP}/linux-2.4*-xen-sparse ] then # this is a new style Xen repository so building is dead easy |