From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1N8L4x-0000mk-A9 for mharc-grub-devel@gnu.org; Wed, 11 Nov 2009 16:50:15 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8L4u-0000jI-6r for grub-devel@gnu.org; Wed, 11 Nov 2009 16:50:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8L4p-0000Ze-As for grub-devel@gnu.org; Wed, 11 Nov 2009 16:50:11 -0500 Received: from [199.232.76.173] (port=38678 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8L4p-0000ZO-83 for grub-devel@gnu.org; Wed, 11 Nov 2009 16:50:07 -0500 Received: from xvm-190-8.ghst.net ([217.70.190.8]:34307 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N8L4o-0002Dc-N2 for grub-devel@gnu.org; Wed, 11 Nov 2009 16:50:07 -0500 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1N8L4l-0006n8-98 for grub-devel@gnu.org; Wed, 11 Nov 2009 22:50:03 +0100 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1N8L4k-0004R9-PT for grub-devel@gnu.org; Wed, 11 Nov 2009 22:50:02 +0100 Date: Wed, 11 Nov 2009 22:50:02 +0100 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20091111215002.GA17025@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="2fHTh5uZTiUOsy+g" Content-Disposition: inline Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH] Unification of grub-mkrescue X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 21:50:12 -0000 --2fHTh5uZTiUOsy+g Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Attached is a unified version of grub-mkrescue. This grub-mkrescue not just provides both i386-pc and i386-coreboot support from the same source, but also from the same runtime. Provided that both i386-pc and i386-coreboot ports are installed [1], grub-mkrescue will generate a CDROM image that is bootable on both platforms at the same time. Please give it some review, I'll be committing this to util/grub-mkrescue.in shortly. [1] Currently a bit problematic due to file conflicts; this fixes one of them (the other is grub-install). -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all." --2fHTh5uZTiUOsy+g Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="grub-mkrescue.in" #! /bin/sh -e # Make GRUB rescue image # Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc. # # GRUB 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 3 of the License, or # (at your option) any later version. # # GRUB 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 GRUB. If not, see . # Initialize some variables. transform="@program_transform_name@" prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ target_cpu=@target_cpu@ coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-coreboot pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc grub_mkisofs="grub-mkisofs" # Usage: usage # Print the usage. usage () { cat <. EOF } # Check the arguments. for option in "$@"; do case "$option" in -h | --help) usage exit 0 ;; -v | --version) echo "$0 (GNU GRUB ${PACKAGE_VERSION})" exit 0 ;; --modules=*) modules=`echo "$option" | sed 's/--modules=//'` ;; --output=*) output_image=`echo "$option" | sed 's/--output=//'` ;; -*) echo "Unrecognized option \`$option'" 1>&2 usage exit 1 ;; *) source="${source} ${option}" ;; esac done iso9660_dir=`mktemp -d` mkdir -p ${iso9660_dir}/boot/grub for platform in pc coreboot ; do input_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-${platform} if test -e ${input_dir} ; then mkdir -p ${iso9660_dir}/boot/grub/${target_cpu}-${platform} for file in ${input_dir}/*.mod ${input_dir}/efiemu??.o \ ${input_dir}/command.lst ${input_dir}/moddep.lst ${input_dir}/fs.lst \ ${input_dir}/handler.lst ${input_dir}/parttool.lst; do if test -f "$file"; then cp -f "$file" ${iso9660_dir}/boot/grub/${target_cpu}-${platform}/ fi done fi done # build coreboot core.img if test -e ${coreboot_dir} ; then memdisk_img=`mktemp` memdisk_dir=`mktemp -d` mkdir -p ${memdisk_dir}/boot/grub # obtain date-based UUID iso_uuid=$(date +%Y-%m-%d-%H-%M-%S-00) cat << EOF >> ${memdisk_dir}/boot/grub/grub.cfg search --fs-uuid --set ${iso_uuid} set prefix=(\${root})/boot/grub/${target_cpu}-coreboot source /boot/grub/grub.cfg EOF tar -C ${memdisk_dir} -cf ${memdisk_img} boot rm -rf ${memdisk_dir} grub-mkelfimage -d ${coreboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \ memdisk tar search iso9660 configfile sh \ ata at_keyboard rm -f ${memdisk_img} grub_mkisofs="${grub_mkisofs} --modification-date=$(echo ${iso_uuid} | sed -e s/-//g)" fi if [ "${source}" != "" ] ; then for d in ${source}; do echo "Processing $d" cp -dpRl "${d}" ${iso9660_dir}/ done fi # second-stage grub.cfg for i in ${coreboot_dir} ${pc_dir} ; do if test -e $i/partmap.lst ; then modules="$(cat $i/partmap.lst) ${modules}" break fi done for i in ${modules} ; do echo "insmod $i" done > ${iso9660_dir}/boot/grub/grub.cfg # build eltorito core.img if test -e ${pc_dir} ; then core_img=`mktemp` grub-mkimage -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \ memdisk tar search iso9660 configfile sh \ biosdisk cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img rm -f ${core_img} cat > ${iso9660_dir}/boot/grub/i386-pc/grub.cfg << EOF source /boot/grub/grub.cfg EOF grub_mkisofs="${grub_mkisofs} -b boot/grub/i386-pc/eltorito.img -boot-info-table" fi # build iso image ${grub_mkisofs} -o ${output_image} -r -J ${iso9660_dir} rm -rf ${iso9660_dir} exit 0 --2fHTh5uZTiUOsy+g--