|
|
|
|
|
|
|
|
|
|
xen-changelog
[Xen-changelog] Many files:
ChangeSet 1.1159.258.123, 2005/05/13 23:53:08+01:00, cl349@xxxxxxxxxxxxxxxxxxxx
Many files:
Create vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST) and
vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST) symlinks in
dist/install/boot from kernel build target.
install.sh:
No need to create vmlinuz symlinks in dist/install/boot from
install.sh
anymore.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
buildconfigs/mk.linux-2.4-xen0 | 2 +-
buildconfigs/mk.linux-2.4-xenU | 2 +-
buildconfigs/mk.linux-2.6-xen0 | 2 +-
buildconfigs/mk.linux-2.6-xenU | 2 +-
install.sh | 9 ---------
linux-2.4.29-xen-sparse/arch/xen/Makefile | 3 +++
linux-2.6.11-xen-sparse/arch/xen/Makefile | 3 +++
7 files changed, 10 insertions(+), 13 deletions(-)
diff -Nru a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
--- a/buildconfigs/mk.linux-2.4-xen0 2005-05-13 21:03:32 -04:00
+++ b/buildconfigs/mk.linux-2.4-xen0 2005-05-13 21:03:32 -04:00
@@ -32,7 +32,7 @@
./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 -Nru a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
--- a/buildconfigs/mk.linux-2.4-xenU 2005-05-13 21:03:32 -04:00
+++ b/buildconfigs/mk.linux-2.4-xenU 2005-05-13 21:03:32 -04:00
@@ -27,7 +27,7 @@
./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 -Nru a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
--- a/buildconfigs/mk.linux-2.6-xen0 2005-05-13 21:03:32 -04:00
+++ b/buildconfigs/mk.linux-2.6-xen0 2005-05-13 21:03:32 -04:00
@@ -27,7 +27,7 @@
./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 -Nru a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
--- a/buildconfigs/mk.linux-2.6-xenU 2005-05-13 21:03:32 -04:00
+++ b/buildconfigs/mk.linux-2.6-xenU 2005-05-13 21:03:32 -04:00
@@ -27,7 +27,7 @@
./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 -Nru a/install.sh b/install.sh
--- a/install.sh 2005-05-13 21:03:32 -04:00
+++ b/install.sh 2005-05-13 21:03:32 -04:00
@@ -23,15 +23,6 @@
fi
echo "Installing Xen from '$src' to '$dst'..."
-cd $src/boot
-(echo '2.6.*' -2.6; echo '2.4.*' -2.4; echo '2.*.*' '') | while read m v
-do
- l=$(eval ls -t vmlinuz-$m-xen0 2>/dev/null | head -n 1)
- [ -e "$l" ] && ln -fs "$l" vmlinuz${v}-xen0
- l=$(eval ls -t vmlinuz-$m-xenU 2>/dev/null | head -n 1)
- [ -e "$l" ] && ln -fs "$l" vmlinuz${v}-xenU
-done
-cd -
cp -fdRL $src/* $dst
echo "All done."
diff -Nru a/linux-2.4.29-xen-sparse/arch/xen/Makefile
b/linux-2.4.29-xen-sparse/arch/xen/Makefile
--- a/linux-2.4.29-xen-sparse/arch/xen/Makefile 2005-05-13 21:03:32 -04:00
+++ b/linux-2.4.29-xen-sparse/arch/xen/Makefile 2005-05-13 21:03:32 -04:00
@@ -113,10 +113,13 @@
INSTALL_NAME ?= $(KERNELRELEASE)
install: bzImage
mkdir -p $(INSTALL_PATH)/boot
+ ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
$(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
+ rm -f $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
install -m0644 arch/$(ARCH)/boot/bzImage
$(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
install -m0644 vmlinux
$(INSTALL_PATH)/boot/vmlinux-syms-$(INSTALL_NAME)$(INSTALL_SUFFIX)
install -m0664 .config
$(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX)
install -m0664 System.map
$(INSTALL_PATH)/boot/System.map-$(INSTALL_NAME)$(INSTALL_SUFFIX)
+ ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
$(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
%_config: arch/xen/defconfig-%
rm -f .config arch/xen/defconfig
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/Makefile
b/linux-2.6.11-xen-sparse/arch/xen/Makefile
--- a/linux-2.6.11-xen-sparse/arch/xen/Makefile 2005-05-13 21:03:32 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile 2005-05-13 21:03:32 -04:00
@@ -48,10 +48,13 @@
XINSTALL_NAME ?= $(KERNELRELEASE)
install: vmlinuz
mkdir -p $(INSTALL_PATH)/boot
+ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
$(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
+ rm -f $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
install -m0644 vmlinuz
$(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
install -m0644 vmlinux
$(INSTALL_PATH)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
install -m0664 .config
$(INSTALL_PATH)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
install -m0664 System.map
$(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
$(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
install -m0644 include/asm-xen/linux-public/*.h
$(INSTALL_PATH)/usr/include/xen/linux
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
<Prev in Thread] |
Current Thread |
[Next in Thread>
|
- [Xen-changelog] Many files:, BitKeeper Bot
- [Xen-changelog] Many files:, BitKeeper Bot
- [Xen-changelog] Many files:, BitKeeper Bot
- [Xen-changelog] Many files:, BitKeeper Bot
- [Xen-changelog] Many files:, BitKeeper Bot
- [Xen-changelog] Many files:,
BitKeeper Bot <=
- [Xen-changelog] Many files:, BitKeeper Bot
- [Xen-changelog] Many files:, BitKeeper Bot
- [Xen-changelog] Many files:, BitKeeper Bot
- [Xen-changelog] Many files:, BitKeeper Bot
- [Xen-changelog] Many files:, BitKeeper Bot
|
|
|
|
|