Date: Saturday, June 22, 2013 @ 12:15:33
Author: tpowa
Revision: 188835
upgpkg: grub 2.00-1
remove any packages
Modified:
grub/trunk/PKGBUILD
----------+
PKGBUILD | 343 ++++++++++++++++++++++++++++---------------------------------
1 file changed, 163 insertions(+), 180 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-22 10:03:56 UTC (rev 188834)
+++ PKGBUILD 2013-06-22 10:15:33 UTC (rev 188835)
@@ -1,95 +1,94 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott)
(ccoomm)>
+# Maintainer : Tobias Powalowski <tp...@archlinux.org>
+# Maintainer : Ronald van Haren <ronald.archlinux.org>
+# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott)
(ccoomm)>
-_grub_lua_ver=24
-_grub_ntldr_ver=21
-_grub_915_ver=9
+## grub-extras lua and gpxe fail to build
-pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
-pkgbase=grub
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
+
+pkgname=grub
+pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.00
-pkgrel=5
+pkgrel=1
url="https://www.gnu.org/software/grub/";
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
license=('GPL3')
+backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
+install="${pkgname}.install"
+options=('!makeflags')
+
+conflicts=('grub-legacy' 'grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+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')
+ 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr')
+depends=('sh' 'xz' 'gettext' 'device-mapper')
+optdepends=('freetype2: For grub-mkfont usage'
+ 'fuse: For grub-mount usage'
+ 'dosfstools: For EFI support'
+ 'efibootmgr: For grub-install EFI support'
+ 'libisoburn: Provides xorriso for generating grub rescue iso using
grub-mkrescue'
+ 'os-prober: To detect other OSes when generating grub.cfg in BIOS
systems'
+ 'mtools: For grub-mkrescue FAT FS support')
source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz";
-
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz";
-
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz";
-
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz";
+ '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
+ 'grub-2.00-fix-docs.patch'
'archlinux_grub_mkconfig_fixes.patch'
+ '60_memtest86+'
'grub.default'
- 'grub.cfg'
- '60_memtest86+'
- 'grub_bzr_export.sh'
- '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
- 'grub-2.00-fix-docs.patch')
-md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
- '704ea9f250b6137f05fa0197fd07053a'
- '77f7d5f8ce395663cd7fff4d37099957'
- 'a80e2b1d3bab778c3b6117d5a698992f'
- '3b3dae993939b4e323f19365dd830e12'
- 'a03ffd56324520393bf574cefccb893d'
- 'f184b060fe22eca662ad455c69241496'
- 'be55eabc102f2c60b38ed35c203686d6'
- 'f343ed2340ebc86c427873641bb72419'
- 'ab751d1d8cd3fd47e5ee24d71ecc31ed'
- '342dd18472a24e5fd252458b24f39a29')
+ 'grub.cfg')
-noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
- "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
- "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
+for _DIR_ in 915resolution ntldr-img ; do
+
source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/")
+done
+source+=("grub-extras-lua::bzr+bzr://bzr.savannah.gnu.org/grub-extras/lua/#revision=24"
+
"grub-extras-gpxe::bzr+bzr://bzr.savannah.gnu.org/grub-extras/gpxe/#revision=13")
+sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
+ 'b68565bc155094bade390c257c3f31bc55ae244b'
+ '1dc08391bb13f8e23faa21a76cc4cc4b25467702'
+ '26e4e946190bea1f03632658cf08ba90e11dec57'
+ '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
+ 'dbf493dec4722feb11f0b5c71ad453a18daf0fc5'
+ '5b7fcb0718a23035c039eb2fda9e088bb13ae611'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
+
_build_grub-common_and_bios() {
-
- ## copy the source for building the common/bios package
- cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}"
- cd "${srcdir}/grub_bios-${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_bios-${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_bios-${pkgver}/configure.ac"
-
- ## add the grub-extra sources
- export GRUB_CONTRIB="${srcdir}/grub_bios-${pkgver}/grub-extras/"
- install -d "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
- bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
- -C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
- bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
\
- -C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
- bsdtar xf
"${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \
- -C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
- ## Requires python2
- # sed 's|python |python2 |g' -i
"${srcdir}/grub_bios-${pkgver}/autogen.sh"
-
- # fix compiling with gcc48
- patch -Np1 -i
${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
-
- #fix docs compiling
- patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
-
- ## start the actual build process
- cd "${srcdir}/grub_bios-${pkgver}"
+
+ ## Copy the source for building the common/bios package
+ cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-bios-${pkgver}"
+ cd "${srcdir}/grub-bios-${pkgver}/"
+
+ ## Add the grub-extra sources
+ export GRUB_CONTRIB="${srcdir}/grub-bios-${pkgver}/grub-extras/"
+
+ install -d "${srcdir}/grub-bios-${pkgver}/grub-extras"
+ for _DIR_ in 915resolution ntldr-img lua gpxe ; do
+ cp -r "${srcdir}/grub-extras-${_DIR_}"
"${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}"
+ done
+
+ ## Unset all compiler FLAGS for bios build
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ ## Start the actual build process
+ cd "${srcdir}/grub-bios-${pkgver}/"
./autogen.sh
echo
-
- CFLAGS="" ./configure \
+
+ CFLAGS="-fno-stack-protector" ./configure \
--with-platform="pc" \
--target="i386" \
- --host="${CARCH}-unknown-linux-gnu" \
"${_EFIEMU}" \
--enable-mm-debug \
--enable-nls \
@@ -104,43 +103,43 @@
--infodir="/usr/share/info" \
--datarootdir="/usr/share" \
--sysconfdir="/etc" \
- --program-prefix="" \
+ --program-prefix="" \
--with-bootdir="/boot" \
--with-grubdir="grub" \
--disable-werror
echo
-
- CFLAGS="" make
+
+ make
echo
-
}
-_build_grub-efi-i386() {
-
- ## copy the source for building the efi package
- cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_efi-${pkgver}"
- cd "${srcdir}/grub_efi-${pkgver}"
-
- export GRUB_CONTRIB="${srcdir}/grub_efi-${pkgver}/grub-extras/"
- install -d "${srcdir}/grub_efi-${pkgver}/grub-extras"
-
- bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
- -C "${srcdir}/grub_efi-${pkgver}/grub-extras"
-
- # fix compiling with gcc48
- patch -Np1 -i
${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
-
- #fix docs compiling
- patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
-
- cd "${srcdir}/grub_efi-${pkgver}"
+_build_grub-efi() {
+
+ ## Copy the source for building the efi package
+ cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-efi-${pkgver}"
+ cd "${srcdir}/grub-efi-${pkgver}/"
+
+ export GRUB_CONTRIB="${srcdir}/grub-efi-${pkgver}/grub-extras/"
+
+ install -d "${srcdir}/grub-efi-${pkgver}/grub-extras/"
+ for _DIR_ in lua gpxe ; do
+ cp -r "${srcdir}/grub-extras-${_DIR_}"
"${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}"
+ done
+
+ ## Unset all compiler FLAGS for efi build
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ cd "${srcdir}/grub-efi-${pkgver}/"
./autogen.sh
echo
-
- CFLAGS="" ./configure \
+
+ ./configure \
--with-platform="efi" \
- --target="i386" \
- --host="${CARCH}-unknown-linux-gnu" \
+ --target="${_EFI_ARCH}" \
--disable-efiemu \
--enable-mm-debug \
--enable-nls \
@@ -160,110 +159,94 @@
--with-grubdir="grub" \
--disable-werror
echo
-
- CFLAGS="" make
+
+ make
echo
-
+
}
build() {
-
- ## set architecture dependent variables
+
+ ## Set ARCH dependent variables
if [[ "${CARCH}" == 'x86_64' ]]; then
_EFIEMU="--enable-efiemu"
else
_EFIEMU="--disable-efiemu"
fi
-
- _HOST="${CARCH}"
-
- cd "${srcdir}/grub-${pkgver}"
- # _get_locale_files
-
+
+ cd "${srcdir}/grub-${pkgver}/"
+
+ ## Fix compiling with gcc48
+ patch -Np1 -i
"${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch"
+ echo
+
+ ## Fix docs compiling
+ patch -Np1 -i "${srcdir}/grub-2.00-fix-docs.patch"
+ echo
+
+ ## 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"
+
_build_grub-common_and_bios
echo
-
- _build_grub-efi-i386
+
+ _build_grub-efi
echo
}
-package_grub-common() {
-
- pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files"
- depends=('sh' 'xz' 'gettext' 'device-mapper')
- optdepends=('freetype2: for grub-mkfont usage'
- 'fuse: for grub-mount usage')
- conflicts=('grub-legacy' 'grub')
- replaces=('grub2-common')
- provides=('grub2-common')
- backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
- optdepends=('libisoburn: provides xorriso for generating grub rescue
iso using grub-mkrescue'
- 'os-prober: to detect other OSes when generating grub.cfg
in BIOS systems'
- 'mtools: for grub-mkrescue FAT FS support')
- install="grub.install"
- options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
-
- cd "${srcdir}/grub_bios-${pkgver}"
+_package_grub-common_and_bios() {
+
+ cd "${srcdir}/grub-bios-${pkgver}/"
make DESTDIR="${pkgdir}/"
bashcompletiondir="/usr/share/bash-completion/completions" install
echo
-
- ## install extra /etc/grub.d/ files
+
+ ## remove gdb debugging related files
+ 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
install -D -m0755 "${srcdir}/60_memtest86+"
"${pkgdir}/etc/grub.d/60_memtest86+"
-
- ## install /etc/default/grub (used by grub-mkconfig)
+
+ ## Install /etc/default/grub (used by grub-mkconfig)
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 grub.cfg for backup array
install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
-
- # remove platform specific files
- rm -rf "${pkgdir}/usr/lib/grub/i386-pc/"
-
- # Fix OS naming FS#33393
- sed -i 's|GNU/Linux|Linux|' ${pkgdir}/etc/grub.d/10_linux
+
}
-package_grub-bios() {
-
- pkgdesc="GNU GRand Unified Bootloader - i386 PC BIOS Modules"
- depends=("grub-common=${pkgver}")
- options=('!strip' '!emptydirs')
- replaces=('grub2-bios')
- provides=('grub2-bios')
-
- cd "${srcdir}/grub_bios-${pkgver}"
+_package_grub-efi() {
+
+ cd "${srcdir}/grub-efi-${pkgver}/"
make DESTDIR="${pkgdir}/" install
echo
-
- ## remove non platform-specific files
- rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
+
## remove gdb debugging related files
- 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
-
+ 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
+
}
-package_grub-efi-i386() {
-
- pkgdesc="GNU GRand Unified Bootloader - i386 UEFI Modules"
- depends=("grub-common=${pkgver}" 'dosfstools' 'efibootmgr')
- options=('!strip' '!emptydirs')
- replaces=('grub2-efi-i386')
- provides=('grub2-efi-i386')
-
- cd "${srcdir}/grub_efi-${pkgver}"
- make DESTDIR="${pkgdir}/" install
- echo
-
- ## remove non platform-specific files
- rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
- ## remove gdb debugging related files
- rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true
- rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true
- rm -f
"${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
-
+package() {
+
+ _package_grub-efi
+
+ _package_grub-common_and_bios
+
}
