Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=84236ff531b3ea73664230e6f32d330bc9a42b85
commit 84236ff531b3ea73664230e6f32d330bc9a42b85 Author: James Buren <r...@frugalware.org> Date: Wed Sep 14 05:31:47 2011 -0500 grub2-1.99-2-x86_64 * add runtime detection of whether to use EFI or PC booting. diff --git a/source/base-extra/grub2/FrugalBuild b/source/base-extra/grub2/FrugalBuild index a616d4c..74ad4d1 100644 --- a/source/base-extra/grub2/FrugalBuild +++ b/source/base-extra/grub2/FrugalBuild @@ -4,16 +4,16 @@ pkgname=grub2 _F_archive_name=grub pkgver=1.99 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU GRand Unified Bootloader" url="http://www.gnu.org/software/grub/"; conflicts=('grub') -depends=('xz' 'bzip2' 'freetype2' 'mktemp' 'ncurses') +depends=('xz' 'bzip2' 'freetype2' 'mktemp' 'ncurses' 'efibootmgr') groups=('base-extra') archs=('i686' 'x86_64') up2date="Flasttar ftp://ftp.gnu.org/gnu/grub/"; -source=("ftp://ftp.gnu.org/gnu/grub/$_F_archive_name-$pkgver$pkgextraver.tar.xz";) -signatures=("${source[@]}.sig") +source=("ftp://ftp.gnu.org/gnu/grub/$_F_archive_name-$pkgver$pkgextraver.tar.xz"; 'grub') +signatures=("${source[0]}.sig" '') _build_grub_platform() { @@ -31,6 +31,7 @@ build() _build_grub_platform efi _build_grub_platform pc fi + Ffile /etc/default/grub } # optimization OK diff --git a/source/base-extra/grub2/grub b/source/base-extra/grub2/grub new file mode 100644 index 0000000..16be183 --- /dev/null +++ b/source/base-extra/grub2/grub @@ -0,0 +1,18 @@ +# This tries to guess the proper platform. + +case $(uname -m) in +i686) + target_cpu=i386 + platform=pc + ;; +x86_64) + efibootmgr &> /dev/null + if [ $? -ne 0 ]; then + target_cpu=i386 + platform=pc + else + target_cpu=x86_64 + platform=efi + fi + ;; +esac _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
