Attachment 313624 Details for Bug 456559 – mk-images-replace-kernel-xen-with-pv_ops-kernel.patch

[patch] mk-images-replace-kernel-xen-with-pv_ops-kernel.patch

0001-mk-images-replace-kernel-xen-with-pv_ops-kernel.patch (text/plain), 5.52 KB, created by Mark McLoughlin on 2008-08-06 17:23:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark McLoughlin

Created: 2008-08-06 17:23:46 UTC

Size: 5.52 KB

patch

obsolete

>From 570b2f8dcd217a55599a38f302b3229a503cc971 Mon Sep 17 00:00:00 2001
>From: Mark McLoughlin <markmc@redhat.com>
>Date: Wed, 6 Aug 2008 11:25:03 +0100
>Subject: [PATCH] mk-images: replace kernel-xen with pv_ops kernel
>
>kernel-xen is dead, replaced now with pv_ops Xen guest
>support in the stock kernels.
>
>On x86_64 and ia64, we now just point the [images-xen]
>.treeinfo stanza at the stock kernels in images/pxeboot.
>
>On x86_32, things are a bit more complicated. The stock
>kernel is kernel.i586 but Xen guests support is only
>included in kernel-PAE.i686 because Xen only runs in PAE
>mode.
>
>In this case, we just copy the kernel-PAE vmlinuz to
>images/pxeboot/vmlinuz-PAE and build another initrd as
>images/pxeboot/initrd-PAE.img. It's these images we point
>the [images-xen] stanza at.
>
>Signed-off-by: Mark McLoughlin <markmc@redhat.com>
>---
> scripts/mk-images      |    9 ++++-----
> scripts/mk-images.efi  |    2 +-
> scripts/mk-images.ia64 |   18 ++----------------
> scripts/mk-images.x86  |   36 +++++++++++++++++++++---------------
> 4 files changed, 28 insertions(+), 37 deletions(-)
>
>diff --git a/scripts/mk-images b/scripts/mk-images
>index 9194974..c187b21 100755
>--- a/scripts/mk-images
>+++ b/scripts/mk-images
>@@ -761,12 +761,13 @@ if [ "$BUILDARCH" = "ppc" ]; then
> elif [ "$BUILDARCH" = "i386" ]; then
>     arches="i586"
>     efiarch="ia32"
>-    kerneltags="kernel kernel-xen"
>+    kerneltags="kernel kernel-PAE"
>+    kernelxen="kernel-PAE"
> elif [ "$BUILDARCH" = "x86_64" ]; then
>-    kerneltags="kernel kernel-xen"
>+    kerneltags="kernel"
>     efiarch="x64"
> elif [ "$BUILDARCH" = "ia64" ]; then
>-    kerneltags="kernel kernel-xen"
>+    kerneltags="kernel"
>     efiarch="ia64"
> fi
> 
>@@ -797,8 +798,6 @@ for KERNELARCH in $arches; do
> 
>     foundakernel="yes"
> 
>-    if [ "${kernelvers}" = "kernel-xen" ]; then kerneltag="xen" ; fi
>-
>     if [ "$BUILDARCH" = "ia64" ]; then
> 	vmlinuz=$(rpm --nodigest --nosignature -qpl $kpackage |grep ^/boot/efi/EFI/redhat/vmlinuz | head -n 1)
> 	version=${vmlinuz##/boot/efi/EFI/redhat/vmlinuz-}
>diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi
>index f3447db..b891b9c 100755
>--- a/scripts/mk-images.efi
>+++ b/scripts/mk-images.efi
>@@ -162,7 +162,7 @@ prepareEfiTree() {
> 
> makeEfiImages() {
>     yumconf="$1"
>-    if [ "$kerneltag" != "xen" ]; then
>+    if [ "$kernelvers" != "$kernelxen" ]; then
> 	local grubarch=${efiarch}
> 	case ${efiarch} in
> 	    ia32) grubarch=i386 ;;
>diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
>index e5718b5..55b2fc7 100644
>--- a/scripts/mk-images.ia64
>+++ b/scripts/mk-images.ia64
>@@ -124,7 +124,6 @@ EOF
> }
> 
> makeBootImages() {
>-  if [ "$kerneltag" != "xen" ]; then
>     # Because ia64 boxes use EFI there needs to be a boot.img dosfs.
>     echo "making boot.img for EFI bootloader"
>     makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz  \
>@@ -159,24 +158,11 @@ kernel = images/pxeboot/vmlinuz
> initrd = images/pxeboot/initrd.img
> boot.img = images/boot.img
> 
>-__EOT__
>-
>-  else # set up the boot stuff for the xen guest kernel
>-    echo "Building $KERNELARCH guest initrd.img"
>-    mkdir -p $TOPDESTPATH/images/xen
>-    makeinitrd --initrdto $TOPDESTPATH/images/xen/initrd.img \
>-	--initrdsize 12288 \
>-	--loaderbin loader \
>-	--modules "$INITRDMODS"
>-    [ $? = 0 ] || exit 1
>-    cp $KERNELROOT/boot/efi/EFI/redhat/vmlinuz-*xen* $TOPDESTPATH/images/xen/vmlinuz
>-    cat << __EOT__ >> $TOPDESTPATH/.treeinfo
> [images-xen]
>-kernel = images/xen/vmlinuz
>-initrd = images/xen/initrd.img
>+kernel = images/pxeboot/vmlinuz
>+initrd = images/pxeboot/initrd.img
> 
> __EOT__
>-  fi
> }
> 
> doPostImages() {
>diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
>index 98fdb6f..11bc92a 100644
>--- a/scripts/mk-images.x86
>+++ b/scripts/mk-images.x86
>@@ -88,14 +88,25 @@ be written to the device using dd.
> EOF
> 
> makeBootImages() {
>-  if [ "$kerneltag" != "xen" ]; then
>-    echo "Building initrd.img"
>-    makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
>+  local initrd="initrd.img"
>+  local kernelimage="vmlinuz"
>+
>+  if [ "$kernelvers" = "$kernelxen" ] ; then
>+    local tag="${kernelvers#kernel}"
>+    if [ -n "$tag" -a "$tag" != "$kernelvers" ] ; then
>+      initrd="initrd${tag}.img"
>+      kernelimage="vmlinuz${tag}"
>+    fi
>+  fi
>+
>+  echo "Building $initrd"
>+  makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/$initrd \
> 	--initrdsize 8192 \
> 	--loaderbin loader \
> 	--modules "$INITRDMODS"
>-    [ $? = 0 ] || exit 1
>+  [ $? = 0 ] || exit 1
> 
>+  if [ "$kernelvers" != "$kernelxen" ] ; then
>     if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
> 	echo "Building isolinux directory"
> 	MBD_BOOTTREE=$TOPDESTPATH/isolinux
>@@ -134,20 +145,15 @@ kernel = images/pxeboot/vmlinuz
> initrd = images/pxeboot/initrd.img
> __EOT__
>     if [ -n "$BOOTISO" ]; then echo "boot.iso = images/$BOOTISO" >> $TOPDESTPATH/.treeinfo ; fi    
>+  fi
> 
>-  else # set up the boot stuff for the xen guest kernel
>-    echo "Building $KERNELARCH guest initrd.img"
>-    mkdir -p $TOPDESTPATH/images/xen
>-    makeinitrd --initrdto $TOPDESTPATH/images/xen/initrd.img \
>-	--initrdsize 8192 \
>-	--loaderbin loader \
>-	--modules "$INITRDMODS"
>-    [ $? = 0 ] || exit 1
>-    cp $KERNELROOT/boot/vmlinuz-*xen* $TOPDESTPATH/images/xen/vmlinuz
>+  # set up the boot stuff for the xen guest kernel
>+  if [ -z "$kernelxen" -o "$kernelvers" = "$kernelxen" ] ; then
>+    cp $KERNELROOT/boot/vmlinuz-$version $TOPDESTPATH/images/pxeboot/$kernelimage
>     cat << __EOT__ >> $TOPDESTPATH/.treeinfo
> [images-xen]
>-kernel = images/xen/vmlinuz
>-initrd = images/xen/initrd.img
>+kernel = images/pxeboot/$kernelimage
>+initrd = images/pxeboot/$initrd
> 
> __EOT__
>   fi
>-- 
>1.5.4.1
>

Actions: View | Diff

Attachments on bug 456559: 313624