Date: Sunday, January 8, 2012 @ 06:39:26 Author: ronald Revision: 146287
fix some small stuff in PKGBUILD Modified: grub2/trunk/PKGBUILD ----------+ PKGBUILD | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-08 09:53:08 UTC (rev 146286) +++ PKGBUILD 2012-01-08 11:39:26 UTC (rev 146287) @@ -16,7 +16,9 @@ arch=('i686' 'x86_64') license=('GPL3') epoch=1 -makedepends=('rsync' 'xz' 'bdf-unifont' 'python2' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') +makedepends=('rsync' 'xz' 'bdf-unifont' 'python2' 'autogen' 'texinfo' + 'help2man' 'gettext' 'device-mapper' 'fuse' + 'efibootmgr' 'dosfstools') # source=("ftp://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" source=("ftp://ftp.archlinux.org/other/grub2/grub2_r${_grub2_rev}.tar.xz" @@ -28,8 +30,7 @@ 'grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch' 'archlinux_grub2_mkconfig_fixes.patch' 'grub.default' - 'grub.cfg.bios.example' - 'grub.cfg.uefi.example' + 'grub.cfg' '20_memtest86+' 'grub2_bzr_export.sh') @@ -41,17 +42,16 @@ sha1sums=('3c52ea32bdd83fb7b5d3c408249672e7bc44fa03' '9f2dbf7a3faab24ca92266400aa513fecd3895c8' 'b04994c005910b4bf123f034b30109d5c8d6fd86' - '0ea5456711b08145f806ce58c91f21268c621b40' + 'd2d6bf4af2a372aa1a3edeb5d5193084322b77a9' '8bcaed545956bb33581e1b97ac96a2c3717ec793' 'e149c8f14a74a9c367852a1615e68758f2c71d29' '16af6a7f65cdb10b7d0d0f86d5431609bc495559' 'eaa7665e9cdcd330071437ca3eec1fead5f6d7b8' 'e1477db3700b27b5e5ad3d8fa43028555204759b' - 'd26852723029b5aebc5fb0903cad0b6da1330359' - 'ac323353ed69b8824c40be8dbb1ce3e057df3913' + '8948d89537c12a4202df7c001e65a77030bbe5a3' '82a27eca5277218cf57c6c5767e0b17a72f62229' - 'b872ab94f506ea0d1587ebc3ef7d3d1d3652be7c') - + 'beb31419045db70fee7401aa6448c220a491e2a3') + _build_grub2-common_and_bios() { ## copy the source for building the common/bios package @@ -255,22 +255,22 @@ install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" ## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here) - install -D -m0644 "${srcdir}/grub.cfg.bios.example" "${pkgdir}/boot/grub/grub.cfg" - install -D -m0644 "${srcdir}/grub.cfg.uefi.example" "${pkgdir}/usr/share/grub/grub.cfg.uefi.example" + install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" # remove platform specific files rm -rf "${pkgdir}/usr/lib/grub/i386-pc/" # move grub2 fonts from /usr/lib/grub to /usr/share/grub - incorrect path due to grub2_automake_1.11.2_pkglib_to_pkgdata.patch - mv "${pkgdir}/usr/lib/grub"/{ascii,euro,unicode}.pf2 "${pkgdir}/usr/share/grub/" - mv "${pkgdir}/usr/lib/grub"/{ascii,widthspec}.h "${pkgdir}/usr/share/grub/" + install -d ${pkgdir}/usr/share/grub + install -Dm644 "${pkgdir}/usr/lib/grub"/{ascii,euro,unicode}.pf2 "${pkgdir}/usr/share/grub/" + install -Dm644 "${pkgdir}/usr/lib/grub"/{ascii,widthspec}.h "${pkgdir}/usr/share/grub/" } package_grub2-bios() { pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for i386 PC BIOS" - depends=("grub2-common=${epoch}:${pkgver}") + depends=("grub2-common=${epoch}:${pkgver}" "sh") optdepends=('os-prober: to detect other OSes when generating grub.cfg in BIOS systems') replaces=('grub2') provides=('grub2')