From cb38bc65af525b9b15105ccc318fb8a8a3e53f3b Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Thu, 11 Aug 2011 00:57:40 +0200 Subject: Upgrade to Arch's grub2-1.99-4 patched to recognize our initrd. --- libre/grub2/PKGBUILD | 67 ++++++------- libre/grub2/archlinux_grub2_mkconfig_fixes.patch | 119 +++++++++++------------ libre/grub2/grub.default | 16 ++- libre/grub2/grub2.install | 47 +++++---- libre/grub2/grub2_bzr_export.sh | 103 ++++++++++++++++++++ libre/grub2/parabola-mkconfig.patch | 74 +++++--------- 6 files changed, 250 insertions(+), 176 deletions(-) create mode 100644 libre/grub2/grub2_bzr_export.sh diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index 7c1c0177a..c914ff086 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -1,24 +1,28 @@ # Maintainer: Ronald van Haren # Contributor: Keshav P R -# _grub2_rev=3072 +# The src pkg includes grub2_bzr_export.sh to create newer grub-extras snapshots. Modify the paths in it accordingly. -_grub2_lua_ver=19 +# _grub2_rev=3238 + +_grub2_lua_ver=20 _grub2_gpxe_ver=12 -_grub2_ntldr_ver=13 -_grub2_915_ver=6 +_grub2_ntldr_ver=17 +_grub2_915_ver=7 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase="grub2" -pkgver='1.99~rc1' -pkgrel=4.1 +pkgver='1.99' +pkgrel=4 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') -makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'flex') +epoch=1 +makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper') options=(strip purge docs zipman !emptydirs) -source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz" +# "http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" +source=("ftp://ftp.gnu.org/gnu/grub/grub-1.99.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz" @@ -27,7 +31,7 @@ source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz" 'grub.default' 'grub.cfg' '20_memtest86+' - '05_archtheme' + 'grub2_bzr_export.sh' 'parabola-mkconfig.patch') noextract=("grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" @@ -35,6 +39,17 @@ noextract=("grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz" "grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz") +sha1sums=('a5ae9558f30ce7757a76aa130088b053a87e2fb6' + '9f2dbf7a3faab24ca92266400aa513fecd3895c8' + 'b04994c005910b4bf123f034b30109d5c8d6fd86' + 'e0c1a97770cc23226cf4535c029ef50b17f67974' + '8bcaed545956bb33581e1b97ac96a2c3717ec793' + 'b7e5510c7b171e9c4dbddb42bbf54ce5ee86e2de' + '83bcaca902391f956ea415a0c712cea56d85d0c2' + '8948d89537c12a4202df7c001e65a77030bbe5a3' + '82a27eca5277218cf57c6c5767e0b17a72f62229' + 'beb31419045db70fee7401aa6448c220a491e2a3' + 'cf148a6afe6067db48975cfd08fe5fb6c2d2bf24') build() { # set architecture dependent variables @@ -56,7 +71,7 @@ build_grub2-common_and_bios() { ## Apply Archlinux specific fixes to enable grub2-mkconfig detect Arch kernels and initramfs cd ${srcdir}/grub2_bios-${pkgver} patch -Np1 -i ${srcdir}/archlinux_grub2_mkconfig_fixes.patch - patch -Np1 -i ${srcdir}/parabola-mkconfig.patch + patch -Np1 -i ${srcdir}/parabola-mkconfig.patch # add the grub-extra sources export GRUB_CONTRIB=${srcdir}/grub2_bios-${pkgver}/grub2-extras/ @@ -90,8 +105,7 @@ build_grub2-common_and_bios() { --bindir=/bin --sbindir=/sbin \ --mandir=/usr/share/man --infodir=/usr/share/info \ --sysconfdir=/etc --enable-nls \ - --program-transform-name=s,grub,grub, \ - --disable-werror + --program-transform-name=s,grub,grub, CFLAGS="" make } @@ -121,22 +135,18 @@ build_grub2-efi() { --prefix=/usr --bindir=/bin \ --sbindir=/sbin --mandir=/usr/share/man \ --infodir=/usr/share/info --sysconfdir=/etc \ - --enable-nls --program-transform-name=s,grub,grub, \ - --disable-werror + --enable-nls --program-transform-name=s,grub,grub, CFLAGS="" make } package_grub2-common() { pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms" install="grub2.install" - depends=('xz' 'freetype2' 'device-mapper') + depends=('xz' 'freetype2' 'device-mapper' 'gettext' 'texinfo') conflicts=('grub') backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') cd ${srcdir}/grub2_bios-${pkgver} - make DESTDIR=${pkgdir} install - - ## install grub2-extras ntldr-img's grubinst as /sbin/grubinst - install -Dm755 ${srcdir}/grub2_bios-${pkgver}/grub-core/grubinst ${pkgdir}/sbin/grubinst + make DESTDIR=${pkgdir} install install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_bios-install install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_efi_x86_64-install @@ -155,7 +165,6 @@ package_grub2-common() { ${pkgdir}/sbin/grub_efi_i386-install ## install extra /etc/grub.d/ files - install -Dm755 ${srcdir}/05_archtheme ${pkgdir}/etc/grub.d/05_archtheme install -Dm755 ${srcdir}/20_memtest86+ ${pkgdir}/etc/grub.d/20_memtest86+ ## install /etc/default/grub (used by grub-mkconfig) @@ -170,7 +179,7 @@ package_grub2-common() { package_grub2-bios() { pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for PC BIOS" - depends=(grub2-common=${pkgver}) + depends=(grub2-common=${epoch}:${pkgver}) replaces=('grub2') provides=('grub2') @@ -185,8 +194,8 @@ package_grub2-bios() { package_grub2-efi-i386() { pkgdesc="The GNU GRand Unified Bootloader version 2 - i386 UEFI version" - depends=("grub2-common=${pkgver}" 'dosfstools') - optdepends=('efibootmgr') + depends=("grub2-common=${epoch}:${pkgver}" 'dosfstools' 'efibootmgr') + optdepends=('mtools') cd ${srcdir}/grub2_efi-${pkgver} make DESTDIR=${pkgdir} install @@ -195,15 +204,3 @@ package_grub2-efi-i386() { rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share} rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib} } - -md5sums=('fd602ffaada5ba7939d0ea47091841a5' - '21b709f119e0bef1c51978d757e885dc' - '9e0944f3e63586dc4242fd8b7977e3c4' - '0a124ffc9835100ba0e7de7a0ac1c389' - '0016761d429e6a77b90d09ed6ee8a47d' - '93f0f96911451e86014e04f96e13462f' - '50123c37cf145a98aba4ffb0fc4efba1' - '7cb90ebb04b856ded6ae171c3658fba2' - '5a07e04c4ecb8ed145d54fec3043e0d5' - 'e143ae2e453b7c3ced309667df30da55' - 'bc369fcd7576beba804cad91f2b79f8f') diff --git a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch index 62acd2ee8..11805e309 100644 --- a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch +++ b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch @@ -1,21 +1,7 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index b041a38..6f31dce 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -252,6 +252,8 @@ export GRUB_DEFAULT \ - GRUB_THEME \ - GRUB_GFXPAYLOAD_LINUX \ - GRUB_DISABLE_OS_PROBER \ -+ GRUB_COLOR_NORMAL \ -+ GRUB_COLOR_HIGHLIGHT \ - GRUB_INIT_TUNE \ - GRUB_SAVEDEFAULT \ - GRUB_BADRAM -diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 420b3f3..79fd4fb 100644 ---- a/util/grub.d/00_header.in -+++ b/util/grub.d/00_header.in -@@ -100,6 +100,14 @@ cat <