Add code to create efiboot.img on i386 and x86_64

2 files changed, 147 insertions, 0 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index 88af4565b..002da9ff0 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -723,6 +723,12 @@ doPostImages() {
    /bin/true
 }
 
+# this gets overloaded if we're on an EFI-capable arch (... with grub)
+makeEfiImages()
+{
+    /bin/true
+}
+
 # source the architecture specific mk-images file so we can call functions
 # in it
 if [ ${BUILDARCH} = s390x ]; then
@@ -733,22 +739,27 @@ elif [ ${BUILDARCH} = ppc64 ]; then
     source $TOPDIR/mk-images.ppc 
 elif [ ${BUILDARCH} = "x86_64" -o ${BUILDARCH} = "i386" ]; then
     source $TOPDIR/mk-images.x86
+    source $TOPDIR/mk-images.efi
 else
     source $TOPDIR/mk-images.${BUILDARCH}
 fi
 
 # Find the kernel, unpack it, and verify it
 kerneltags="kernel"
+efiarch=""
 arches="$BUILDARCH"
 if [ "$BUILDARCH" = "ppc" ]; then
     arches="ppc64 ppc64iseries ppc"
 elif [ "$BUILDARCH" = "i386" ]; then
     arches="i586"
+    efiarch="ia32"
     kerneltags="kernel kernel-xen"
 elif [ "$BUILDARCH" = "x86_64" ]; then
     kerneltags="kernel kernel-xen"
+    efiarch="x64"
 elif [ "$BUILDARCH" = "ia64" ]; then
     kerneltags="kernel kernel-xen"
+    efiarch="ia64"
 fi
 
 foundakernel=""
@@ -806,6 +817,8 @@ for KERNELARCH in $arches; do
 
     # make the boot images
     makeBootImages
+
+    makeEfiImages
   done
 done
 
diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi
new file mode 100755
index 000000000..5b0c86bcc
--- /dev/null
+++ b/scripts/mk-images.efi
@@ -0,0 +1,134 @@
+#!/bin/bash
+#
+# mk-images.efi
+#
+# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+#makeefibootdisk required for EFI bootloader dosfs image
+makeefibootdisk() {
+    MBD_FILENAME=""
+    KERNELFILE=""
+    INITRDFILE=""
+    MBD_TMPIMAGE=${TMPDIR:-/tmp}/makebootdisk.image.$$
+    MBD_BOOTTREE=${TMPDIR:-/tmp}/makebootdisk.tree.$$
+    MBD_BOOTTREE_TMP=$MBD_BOOTTREE'_tmp'
+    while [ x$(echo $1 | cut -c1-2) = x"--" ]; do
+	if [ $1 = "--kernel" ]; then
+	    KERNELFILE=$2
+	    shift; shift
+	    continue
+	elif [ $1 = "--initrd" ]; then
+	    INITRDFILE=$2
+	    shift; shift
+	    continue
+	elif [ $1 = "--imagename" ]; then
+	    MBD_FILENAME=$IMAGEPATH/$2
+	    shift; shift
+	    continue
+	fi
+	echo "Unknown option passed to makebootdisk"
+	exit 1
+    done
+
+    if [ -z "$MBD_FILENAME" ]; then
+	echo "No imagename passed"
+	exit 1
+    fi
+
+    if [ -z "$KERNELFILE" ]; then
+	echo "No kernel file passed"
+	exit 1
+    fi
+
+    if [ -z "$INITRDFILE" ]; then
+	echo "No initrd file passed"
+	exit 1
+    fi
+    MBD_FSIMAGE="$INITRDFILE"
+
+    mkdir -p $MBD_BOOTTREE
+    mkdir -p $MBD_BOOTTREE_TMP
+    rm -rf $MBD_BOOTTREE_TMP
+    mkdir -p $MBD_TMPIMAGE
+
+    # provided by the mk-image.$ARCH file
+    prepareEfiImage
+
+    left=$(df $MBD_BOOTTREE | tail -n1)
+    left=$(echo $left | awk '{print $4'})
+
+    umount $MBD_BOOTTREE
+
+    if [ -n "$EXTRAKERNELPATH" ]; then
+	mkdir -p `dirname $EXTRAKERNELPATH`
+	cp -f $KERNELROOT/$KERNELDIR/${KERNELNAME}-* $EXTRAKERNELPATH
+    fi
+
+    mkdir -p `dirname $MBD_FILENAME`
+    rm -rf $MBD_TMPIMAGE $MBD_MNTPOINT $MBD_BOOTTREE
+    if [ -z "$INITRDFILE" ]; then
+	rm -f $MBD_FSIMAGE
+    fi
+
+    echo "Wrote $MBD_FILENAME (${left}k free)"
+}
+
+# prepare and build an efiboot.img.
+prepareEfiImage() {
+    prepareEfiTree
+
+    # dynamically calculate the size of the dosfs
+    BOOTDISKSIZE=$(du -kcs $MBD_BOOTTREE_TMP | tail -n1 | awk '{print $1}')
+    BOOTDISKSIZE=$(expr $BOOTDISKSIZE + 100)
+    echo "The size of the boot.img dosfs is $BOOTDISKSIZE"
+    dd if=/dev/zero bs=1k count=$BOOTDISKSIZE of=$MBD_FILENAME 2>/dev/null
+    mkdosfs -C $MBD_FILENAME $BOOTDISKSIZE >/dev/null
+    mount -o loop,shortname=winnt,umask=0077 -t vfat $MBD_FILENAME $MBD_BOOTTREE
+    cp -R $MBD_BOOTTREE_TMP/* $MBD_BOOTTREE
+}
+
+# prepare a directory with the kernel, initrd, and various message files
+# used to populate the efi boot image
+prepareEfiTree() {
+    mkdir -p $MBD_BOOTTREE_TMP/EFI/boot
+
+    cp -a $BOOTDISKDIR/* $MBD_BOOTTREE_TMP/EFI/boot/
+    cp $INITRDFILE $MBD_BOOTTREE_TMP/EFI/boot/initrd.img
+    cp $KERNELFILE $MBD_BOOTTREE_TMP/EFI/boot/vmlinuz
+
+    sed -i "s/@PRODUCT@/$PRODUCT/g" $MBD_BOOTTREE_TMP/EFI/boot/grub.conf
+    sed -i "s/@VERSION@/$VERSION/g" $MBD_BOOTTREE_TMP/EFI/boot/grub.conf
+
+    # The first generation Mactel machines get the bootloader name wrong
+    # as per the spec.  Awesome, guys.
+    if [ "$efiarch" == "ia32"]; then
+	cp $MBD_BOOTTREE_TMP/EFI/boot/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/boot.efi
+	cp $MBD_BOOTTREE_TMP/EFI/boot/grub.conf $MBD_BOOTTREE_TMP/EFI/boot/boot.conf
+    fi
+
+    mv $MBD_BOOTTREE_TMP/EFI/boot/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.efi
+    mv $MBD_BOOTTREE_TMP/EFI/boot/grub.conf $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.conf
+}
+
+makeEfiImages() {
+    if [ "$kerneltag" != "xen" ]; then
+	makeefibootdisk \
+	    --imagename $TOPDESTPATH/images/efiboot.img \
+	    --kernel $TOPDESTPATH/images/pxeboot/vmlinuz \
+	    --initrd $TOPDESTPATH/images/pxeboot/initrd.img
+    fi
+}