Date: Wednesday, October 23, 2013 @ 22:28:51 Author: tpowa Revision: 197201
upgpkg: grub 1:2.00.900.gbca274b-1 bump to latest version, updated to git Modified: grub/trunk/PKGBUILD ----------+ PKGBUILD | 175 ++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 100 insertions(+), 75 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-10-23 17:37:48 UTC (rev 197200) +++ PKGBUILD 2013-10-23 20:28:51 UTC (rev 197201) @@ -1,18 +1,20 @@ # Maintainer : Tobias Powalowski <[email protected]> # Maintainer : Ronald van Haren <ronald.archlinux.org> -# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor: Keshav Padram Amburay (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -_GRUB_BZR_REV="5086" +_pkgver="2.00" +_GRUB_GIT_COMMIT="bca274b45597725f21f77a773087b62a2922eb2b" -## grub-extras lua and gpxe fail to build with grub bzr rev 5043 +## grub-extras gpxe is not needed [[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" [[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" -pkgname=grub +pkgname="grub" pkgdesc="GNU GRand Unified Bootloader (2)" -pkgver=2.00.${_GRUB_BZR_REV} +pkgver=2.00.900.gbca274b pkgrel=1 +epoch="1" url="https://www.gnu.org/software/grub/"; arch=('x86_64' 'i686') license=('GPL3') @@ -24,8 +26,8 @@ replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") -makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' - 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr') +makedepends=('git' 'bzr' 'xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' + 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' 'fuse: For grub-mount usage' @@ -36,48 +38,79 @@ 'mtools: For grub-mkrescue FAT FS support') # source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"; -source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}" +source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_COMMIT}" 'archlinux_grub_mkconfig_fixes.patch' '60_memtest86+' 'grub.default' - 'grub.cfg' - 'grub-2.00-mkinitcpio-0.15.patch' - 'grub-2.00.5086-fix-lvm-parsing.patch') + 'grub.cfg') + md5sums=('SKIP' 'ee1262cc4e20031df019779b1a4b1e39' 'be55eabc102f2c60b38ed35c203686d6' 'a03ffd56324520393bf574cefccb893d' 'c8b9511586d57d6f2524ae7898397a46' - 'd25d2dcf8ba708dcf768fcaea799f59c' - '7a0ce6aa4a23fa12e1f79ab03fe63f88' 'SKIP' + 'SKIP' 'SKIP') -for _DIR_ in 915resolution ntldr-img ; do +for _DIR_ in 915resolution lua ntldr-img ; do source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=") done +pkgver() { + cd "${srcdir}/grub-${_pkgver}/" + echo "$(git describe --tags)" | sed -e 's|-|\.|g' +} + prepare() { - cd "${srcdir}/grub-${pkgver}" - patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" - patch -Np1 -i "${srcdir}/grub-2.00.5086-fix-lvm-parsing.patch" + + cd "${srcdir}/grub-${_pkgver}/" + + msg "Patch to enable grub-mkconfig detect Arch kernels and initramfs" + patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch" + + msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme" + sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac" + + msg "Fix mkinitcpio 'rw' FS#36275" + sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in" + + msg "Fix OS naming FS#33393" + sed 's|GNU/Linux|Linux|' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in" + + # msg "Requires python2" + # sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh" + + msg "Pull in latest language files" + ./linguas.sh + echo + + msg "Remove non working langs which need LC_ALL=C.UTF-8" + sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS" + } _build_grub-common_and_bios() { - ## Copy the source for building the common/bios package - cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios" - cd "${srcdir}/grub-${pkgver}-bios/" + msg "Set ARCH dependent variables for bios build" + if [[ "${CARCH}" == 'x86_64' ]]; then + _EFIEMU="--enable-efiemu" + else + _EFIEMU="--disable-efiemu" + fi - ## Add the grub-extra sources - export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/" + msg "Copy the source for building the bios package" + cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios" + cd "${srcdir}/grub-${_pkgver}-bios/" - install -d "${srcdir}/grub-${pkgver}-bios/grub-extras" - for _DIR_ in 915resolution ntldr-img ; do - cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}" + msg "Add the grub-extra sources for bios build" + install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras" + for _DIR_ in 915resolution lua ntldr-img ; do + cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-bios/grub-extras/${_DIR_}" done + export GRUB_CONTRIB="${srcdir}/grub-bios/grub-extras/" - ## Unset all compiler FLAGS for bios build + msg "Unset all compiler FLAGS for bios build" unset CFLAGS unset CPPFLAGS unset CXXFLAGS @@ -84,11 +117,13 @@ unset LDFLAGS unset MAKEFLAGS - ## Start the actual build process - cd "${srcdir}/grub-${pkgver}-bios/" + cd "${srcdir}/grub-${_pkgver}-bios/" + + msg "Run autogen.sh for bios build" ./autogen.sh echo + msg "Run ./configure for bios build" ./configure \ --with-platform="pc" \ --target="i386" \ @@ -97,6 +132,7 @@ --enable-nls \ --enable-device-mapper \ --enable-cache-stats \ + --enable-boot-time \ --enable-grub-mkfont \ --enable-grub-mount \ --prefix="/usr" \ @@ -109,9 +145,11 @@ --program-prefix="" \ --with-bootdir="/boot" \ --with-grubdir="grub" \ + --disable-silent-rules \ --disable-werror echo + msg "Run make for bios build" make echo } @@ -118,18 +156,18 @@ _build_grub-efi() { - ## Copy the source for building the efi package - cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi" - cd "${srcdir}/grub-${pkgver}-efi/" + msg "Copy the source for building the efi package" + cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi" + cd "${srcdir}/grub-${_pkgver}-efi/" - # export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-efi/grub-extras/" + msg "Add the grub-extra sources for efi build" + install -d "${srcdir}/grub-${_pkgver}-efi/grub-extras/" + for _DIR_ in lua ; do + cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-efi/grub-extras/${_DIR_}" + done + export GRUB_CONTRIB="${srcdir}/grub-efi/grub-extras/" - # install -d "${srcdir}/grub-${pkgver}-efi/grub-extras/" - # for _DIR_ in lua gpxe ; do - # cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}" - # done - - ## Unset all compiler FLAGS for efi build + msg "Unset all compiler FLAGS for efi build" unset CFLAGS unset CPPFLAGS unset CXXFLAGS @@ -136,10 +174,13 @@ unset LDFLAGS unset MAKEFLAGS - cd "${srcdir}/grub-${pkgver}-efi/" + cd "${srcdir}/grub-${_pkgver}-efi/" + + msg "Run autogen.sh for efi build" ./autogen.sh echo + msg "Run ./configure for efi build" ./configure \ --with-platform="efi" \ --target="${_EFI_ARCH}" \ @@ -148,6 +189,7 @@ --enable-nls \ --enable-device-mapper \ --enable-cache-stats \ + --enable-boot-time \ --enable-grub-mkfont \ --enable-grub-mount \ --prefix="/usr" \ @@ -160,9 +202,11 @@ --program-prefix="" \ --with-bootdir="/boot" \ --with-grubdir="grub" \ + --disable-silent-rules \ --disable-werror echo + msg "Run make for efi build" make echo @@ -170,61 +214,38 @@ build() { - ## Set ARCH dependent variables - if [[ "${CARCH}" == 'x86_64' ]]; then - _EFIEMU="--enable-efiemu" - else - _EFIEMU="--disable-efiemu" - fi + cd "${srcdir}/grub-${_pkgver}/" - cd "${srcdir}/grub-${pkgver}/" - - ## Apply Archlinux specific fixes to enable grub-mkconfig detect Arch kernels and initramfs - patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch" - echo - - ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files - sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac" - - ## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme - sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${pkgver}/configure.ac" - - ## Requires python2 - # sed 's|python |python2 |g' -i "${srcdir}/grub-${pkgver}/autogen.sh" - - ## pull in language files - ./linguas.sh - # remove not working langs which need LC_ALL=C.UTF-8 - sed -i -e 's#en@cyrillic en@greek##g' po/LINGUAS + msg "Build grub bios stuff" _build_grub-common_and_bios echo + msg "Build grub efi stuff" _build_grub-efi echo - + } _package_grub-common_and_bios() { - cd "${srcdir}/grub-${pkgver}-bios/" + cd "${srcdir}/grub-${_pkgver}-bios/" + + msg "Run make install for bios build" make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo - ## remove gdb debugging related files + msg "Remove gdb debugging related files for bios build" rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true - ## Fix OS naming FS#33393 - sed 's|GNU/Linux|Linux|' -i "${pkgdir}/etc/grub.d/10_linux" - - ## Install extra /etc/grub.d/ files + msg "Install extra /etc/grub.d/ files" install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" - ## Install /etc/default/grub (used by grub-mkconfig) + msg "Install /etc/default/grub (used by grub-mkconfig)" install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - ## Install grub.cfg for backup array + msg "Install grub.cfg for backup array" install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" } @@ -231,11 +252,13 @@ _package_grub-efi() { - cd "${srcdir}/grub-${pkgver}-efi/" + cd "${srcdir}/grub-${_pkgver}-efi/" + + msg "Run make install for efi build" make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo - ## remove gdb debugging related files + msg "Remove gdb debugging related files for efi build" rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true @@ -244,8 +267,10 @@ package() { + msg "Package grub efi stuff" _package_grub-efi + msg "Package grub bios stuff" _package_grub-common_and_bios }
