diff options
author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-14 00:21:03 +0000 |
---|---|---|
committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-14 00:21:03 +0000 |
commit | 59f75228fb9a169d6bfcc095fd922909ac84d7ff (patch) | |
tree | 801404b1280bb6a2a3e757e64eaf566ab902d614 /buildconfigs | |
parent | adf9605d5e69fb689eb8505205359c4f805b4e18 (diff) | |
parent | de8b2ec1713b9ce922e85bf736da54d3a7d91a26 (diff) | |
download | xen-59f75228fb9a169d6bfcc095fd922909ac84d7ff.tar.gz xen-59f75228fb9a169d6bfcc095fd922909ac84d7ff.tar.bz2 xen-59f75228fb9a169d6bfcc095fd922909ac84d7ff.zip |
bitkeeper revision 1.1408 (4285446fFFH8-wyJ168gdNkCDjEaNQ)
Merge 2.0-testing changes:
- Install xen binary with version number appended and create several symlinks
for less specific version numbers.
- Change XEN_EXTRAVERSION to -testing, move surrounding-" to compile.h.in.
Also define XEN_FULLVESION and use.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
Diffstat (limited to 'buildconfigs')
-rw-r--r-- | buildconfigs/mk.linux-2.4-xen0 | 2 | ||||
-rw-r--r-- | buildconfigs/mk.linux-2.4-xenU | 2 | ||||
-rw-r--r-- | buildconfigs/mk.linux-2.6-xen0 | 2 | ||||
-rw-r--r-- | buildconfigs/mk.linux-2.6-xenU | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0 index 6044268d09..c760f2f907 100644 --- a/buildconfigs/mk.linux-2.4-xen0 +++ b/buildconfigs/mk.linux-2.4-xen0 @@ -32,7 +32,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref ./mkbuildtree ../$(LINUX_DIR) ) # Patch kernel Makefile to set EXTRAVERSION ( cd $(LINUX_DIR) ; \ - sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ + sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) # add ebtables patch ( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff ) diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU index 4975a98892..180813760e 100644 --- a/buildconfigs/mk.linux-2.4-xenU +++ b/buildconfigs/mk.linux-2.4-xenU @@ -27,7 +27,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref ./mkbuildtree ../$(LINUX_DIR) ) # Patch kernel Makefile to set EXTRAVERSION ( cd $(LINUX_DIR) ; \ - sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ + sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) # 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/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0 index d238a10630..d697872915 100644 --- a/buildconfigs/mk.linux-2.6-xen0 +++ b/buildconfigs/mk.linux-2.6-xen0 @@ -27,7 +27,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref ./mkbuildtree ../$(LINUX_DIR) ) # Patch kernel Makefile to set EXTRAVERSION ( cd $(LINUX_DIR) ; \ - sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ + sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) # 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/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU index 6101664db1..b548cc7193 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -27,7 +27,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref ./mkbuildtree ../$(LINUX_DIR) ) # Patch kernel Makefile to set EXTRAVERSION ( cd $(LINUX_DIR) ; \ - sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ + sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) # Re-use config from install dir if one exits else use default config CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \ |