From f5613a18e8e35f089702eb6a15d7c8df065610c8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 17 Jun 2013 19:32:48 -0300 Subject: grub-2.00-4: updating revision with changes from Arch --- libre/grub/PKGBUILD | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 3969d713a..1d24d181e 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -9,11 +9,11 @@ _grub_915_ver=9 pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') pkgbase=grub pkgver=2.00 -pkgrel=2 +pkgrel=4 url="https://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') -makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' +makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" @@ -23,10 +23,21 @@ source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" 'parabola_grub_mkconfig_fixes.patch' 'grub.default' 'grub.cfg' - '20_memtest86+' + '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' + 'c776aaf2cc35488a7c531b59e697470d' + '52d374e0194e3f2e39ff7c92ecd58a6c' + '255eafb440b8c285b20431366c2d2d27' + '9b6358d3de5c4bb95a041ab7c44a21ec' + 'f343ed2340ebc86c427873641bb72419' + 'ab751d1d8cd3fd47e5ee24d71ecc31ed' + '342dd18472a24e5fd252458b24f39a29') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" @@ -181,7 +192,9 @@ build() { package_grub-common() { pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files (Parabola rebranded)" - depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse') + 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') @@ -197,7 +210,7 @@ package_grub-common() { echo ## install extra /etc/grub.d/ files - install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" + install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" ## install /etc/default/grub (used by grub-mkconfig) install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" @@ -253,14 +266,3 @@ package_grub-efi-i386() { rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true } -md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91' - '704ea9f250b6137f05fa0197fd07053a' - '77f7d5f8ce395663cd7fff4d37099957' - 'a80e2b1d3bab778c3b6117d5a698992f' - 'c776aaf2cc35488a7c531b59e697470d' - '52d374e0194e3f2e39ff7c92ecd58a6c' - '255eafb440b8c285b20431366c2d2d27' - '9b6358d3de5c4bb95a041ab7c44a21ec' - 'f343ed2340ebc86c427873641bb72419' - 'ab751d1d8cd3fd47e5ee24d71ecc31ed' - '342dd18472a24e5fd252458b24f39a29') -- cgit v1.2.3 From 0b241683348cd1a0aad571d58c6d3d694ff4c644 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 17 Jun 2013 21:29:30 -0300 Subject: grub: updating md5sum --- libre/grub/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 1d24d181e..50a8eda05 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -34,7 +34,7 @@ md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91' 'c776aaf2cc35488a7c531b59e697470d' '52d374e0194e3f2e39ff7c92ecd58a6c' '255eafb440b8c285b20431366c2d2d27' - '9b6358d3de5c4bb95a041ab7c44a21ec' + 'ae9f1bc1a579ddc88b9b2e8b46f7e1d5' 'f343ed2340ebc86c427873641bb72419' 'ab751d1d8cd3fd47e5ee24d71ecc31ed' '342dd18472a24e5fd252458b24f39a29') -- cgit v1.2.3 From ac2a24da48a4fba83b1424520217c7fa8c73c0e5 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 18 Jun 2013 17:56:42 -0300 Subject: grub-2.00-5: fix typo in memdisk file --- libre/grub/60_memtest86+ | 2 +- libre/grub/PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+ index 064922ef2..086f0cc84 100644 --- a/libre/grub/60_memtest86+ +++ b/libre/grub/60_memtest86+ @@ -22,7 +22,7 @@ if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})" _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})" cat << EOF -if [ "${grub_platform}" == "pc" ]; then +if [ "\${grub_platform}" == "pc" ]; then menuentry "Memory Tester (memtest86+)" ${CLASS} { search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID} linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86} diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 50a8eda05..522c1517d 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -9,7 +9,7 @@ _grub_915_ver=9 pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') pkgbase=grub pkgver=2.00 -pkgrel=4 +pkgrel=5 url="https://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') @@ -34,7 +34,7 @@ md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91' 'c776aaf2cc35488a7c531b59e697470d' '52d374e0194e3f2e39ff7c92ecd58a6c' '255eafb440b8c285b20431366c2d2d27' - 'ae9f1bc1a579ddc88b9b2e8b46f7e1d5' + 'be55eabc102f2c60b38ed35c203686d6' 'f343ed2340ebc86c427873641bb72419' 'ab751d1d8cd3fd47e5ee24d71ecc31ed' '342dd18472a24e5fd252458b24f39a29') -- cgit v1.2.3 From 0d193f3f30dfbd4383e99ccb0e6d7efd00164214 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 23 Jun 2013 23:07:12 -0300 Subject: grub-2.00-1: remove any packages --- libre/grub/PKGBUILD | 342 +++++++++++++++++++++++++--------------------------- 1 file changed, 162 insertions(+), 180 deletions(-) (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 522c1517d..919822635 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -1,96 +1,95 @@ -# Maintainer: Ronald van Haren -# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Maintainer : Tobias Powalowski +# Maintainer : Ronald van Haren +# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva -_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), (Parabola rebranded)" 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' 'parabola_grub_mkconfig_fixes.patch' - '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' - 'c776aaf2cc35488a7c531b59e697470d' - '52d374e0194e3f2e39ff7c92ecd58a6c' - '255eafb440b8c285b20431366c2d2d27' - 'be55eabc102f2c60b38ed35c203686d6' - 'f343ed2340ebc86c427873641bb72419' - 'ab751d1d8cd3fd47e5ee24d71ecc31ed' - '342dd18472a24e5fd252458b24f39a29') - -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") - + 'grub.default' + 'grub.cfg') + +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' + 'c631ec04d458c60a3ceffe60d2d1806d54554d9c' + '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 Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs - patch -Np1 -i "${srcdir}/parabola_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 \ @@ -105,43 +104,43 @@ _build_grub-common_and_bios() { --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 \ @@ -161,108 +160,91 @@ _build_grub-efi-i386() { --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 Parabola specific fixes to enable grub-mkconfig detect Arch kernels and initramfs + patch -Np1 -i "${srcdir}/parabola_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 (Parabola rebranded)" - 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 - install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" - - ## 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 -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" - - # remove platform specific files - rm -rf "${pkgdir}/usr/lib/grub/i386-pc/" - -} - -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}" - 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 - + + ## 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 -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" + + ## Install grub.cfg for backup array + install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" + } -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}" +_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-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 + 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() { + + _package_grub-efi + + _package_grub-common_and_bios + } -- cgit v1.2.3 From 68317cd977c38acc1b7d295acd3ce21fd2ee889b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 23 Jun 2013 23:09:39 -0300 Subject: grub: remove arch references on pkgbuild --- libre/grub/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 919822635..260643703 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -185,7 +185,7 @@ build() { patch -Np1 -i "${srcdir}/grub-2.00-fix-docs.patch" echo - ## Apply Parabola specific fixes to enable grub-mkconfig detect Arch kernels and initramfs + ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo -- cgit v1.2.3 From 27ac714fba9ffb75a96100a0455b21db41bdda50 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 23 Jun 2013 23:25:44 -0300 Subject: grub: update sha1sum files --- libre/grub/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 260643703..21220a209 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -54,8 +54,8 @@ sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' '1dc08391bb13f8e23faa21a76cc4cc4b25467702' 'c631ec04d458c60a3ceffe60d2d1806d54554d9c' '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559' - 'dbf493dec4722feb11f0b5c71ad453a18daf0fc5' - '5b7fcb0718a23035c039eb2fda9e088bb13ae611' + '06b926320cb2add6c157d59d46e553b89dd3aa03' + '662ec5f0d44122b66666a788387ec69389295b2c' 'SKIP' 'SKIP' 'SKIP' -- cgit v1.2.3 From fce1580b63172a287542e466ccae368960a9b0e0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 26 Jun 2013 04:05:55 -0300 Subject: grub-2.00.5043-1: updating version, build latest bzr snapshot, fixes gcc issues on efi boot --- libre/grub/PKGBUILD | 84 ++++++++----------- libre/grub/grub_bzr_export.sh | 113 -------------------------- libre/grub/parabola_grub_mkconfig_fixes.patch | 12 +-- 3 files changed, 39 insertions(+), 170 deletions(-) delete mode 100644 libre/grub/grub_bzr_export.sh (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 21220a209..59c7dbe0a 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -3,23 +3,25 @@ # Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva -## grub-extras lua and gpxe fail to build +_GRUB_BZR_REV="5043" + +## grub-extras lua and gpxe fail to build with grub bzr rev 5043 [[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" [[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" -pkgver=2.00 +pkgver=2.00.${_GRUB_BZR_REV} pkgrel=1 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') -backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') +backup=('etc/default/grub' 'etc/grub.d/40_custom') install="${pkgname}.install" options=('!makeflags') -conflicts=('grub-legacy' 'grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") +conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy') replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") @@ -28,51 +30,42 @@ makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' 'fuse: For grub-mount usage' - 'dosfstools: For EFI support' + 'dosfstools: For grub-mkrescue FAT FS and 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" - '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch' - 'grub-2.00-fix-docs.patch' +# 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}" 'parabola_grub_mkconfig_fixes.patch' '60_memtest86+' - 'grub.default' - 'grub.cfg') + 'grub.default') for _DIR_ in 915resolution ntldr-img ; do - source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/") + source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=") 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' - 'c631ec04d458c60a3ceffe60d2d1806d54554d9c' +# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' +sha1sums=('SKIP' + '513172d91d1a2e2cda7c0a744c766d5868cb28bf' '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559' '06b926320cb2add6c157d59d46e553b89dd3aa03' - '662ec5f0d44122b66666a788387ec69389295b2c' - '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}/" + cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios" + cd "${srcdir}/grub-${pkgver}-bios/" ## Add the grub-extra sources - export GRUB_CONTRIB="${srcdir}/grub-bios-${pkgver}/grub-extras/" + export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/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_}" + 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_}" done ## Unset all compiler FLAGS for bios build @@ -83,11 +76,11 @@ _build_grub-common_and_bios() { unset MAKEFLAGS ## Start the actual build process - cd "${srcdir}/grub-bios-${pkgver}/" + cd "${srcdir}/grub-${pkgver}-bios/" ./autogen.sh echo - CFLAGS="-fno-stack-protector" ./configure \ + ./configure \ --with-platform="pc" \ --target="i386" \ "${_EFIEMU}" \ @@ -117,15 +110,15 @@ _build_grub-common_and_bios() { _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}/" + cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi" + cd "${srcdir}/grub-${pkgver}-efi/" - export GRUB_CONTRIB="${srcdir}/grub-efi-${pkgver}/grub-extras/" + # export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-efi/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 + # 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 unset CFLAGS @@ -134,7 +127,7 @@ _build_grub-efi() { unset LDFLAGS unset MAKEFLAGS - cd "${srcdir}/grub-efi-${pkgver}/" + cd "${srcdir}/grub-${pkgver}-efi/" ./autogen.sh echo @@ -177,14 +170,6 @@ build() { 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 Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo @@ -208,7 +193,7 @@ build() { _package_grub-common_and_bios() { - cd "${srcdir}/grub-bios-${pkgver}/" + cd "${srcdir}/grub-${pkgver}-bios/" make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo @@ -223,15 +208,12 @@ _package_grub-common_and_bios() { ## Install /etc/default/grub (used by grub-mkconfig) install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - ## Install grub.cfg for backup array - install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" - } _package_grub-efi() { - cd "${srcdir}/grub-efi-${pkgver}/" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/grub-${pkgver}-efi/" + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo ## remove gdb debugging related files diff --git a/libre/grub/grub_bzr_export.sh b/libre/grub/grub_bzr_export.sh deleted file mode 100644 index ff8f99ecc..000000000 --- a/libre/grub/grub_bzr_export.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env bash - -## For actual repos - -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution - -## For launchpad mirror - -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-lua lua -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-gpxe gpxe -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-ntldr-img ntldr-img -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-915resolution 915resolution - -## grub-extras zfs is integrated into grub bzr main repo and is no longer needed separately. - -_WD="${PWD}/" -_OUTPUT_DIR="${_WD}/" - -_ACTUAL_PKGVER="2.00" - -_GRUB_BZR_REPO_DIR="${_WD}/grub_mainline_BZR/" -_GRUB_BZR_EXP_REPO_DIR="${_WD}/grub_experimental_BZR/" -_GRUB_EXTRAS_REPOS_DIR="${_WD}/grub_extras_BZR/" - -_MAIN_SNAPSHOT() { - - cd "${_GRUB_BZR_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_BZR_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" - echo - -} - -_EXP_SNAPSHOT() { - - cd "${_GRUB_BZR_EXP_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_BZR_EXP_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" - echo - -} - -_EXTRAS_SNAPSHOT() { - - cd "${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME})" - bzr export --root="${_GRUB_EXTRAS_NAME}" --format="tar" "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - echo - - xz -9 "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - -} - -echo - -set -x -e - -echo - -_MAIN_SNAPSHOT - -echo - -# _EXP_SNAPSHOT - -echo - -_GRUB_EXTRAS_NAME="lua" -_EXTRAS_SNAPSHOT - -# _GRUB_EXTRAS_NAME="gpxe" -# _EXTRAS_SNAPSHOT - -_GRUB_EXTRAS_NAME="ntldr-img" -_EXTRAS_SNAPSHOT - -_GRUB_EXTRAS_NAME="915resolution" -_EXTRAS_SNAPSHOT - -echo - -set +x +e - -echo - -unset _WD -unset _OUTPUT_DIR -unset _GRUB_BZR_REPO_DIR -unset _GRUB_EXTRAS_REPOS_DIR -unset _GRUB_EXTRAS_NAME diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch index 5324afa01..fbcca19ec 100644 --- a/libre/grub/parabola_grub_mkconfig_fixes.patch +++ b/libre/grub/parabola_grub_mkconfig_fixes.patch @@ -1,8 +1,8 @@ diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 516be86..5f37db2 100644 +index 8decc1d..170047f 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ +@@ -212,6 +212,8 @@ export GRUB_DEFAULT \ GRUB_THEME \ GRUB_GFXPAYLOAD_LINUX \ GRUB_DISABLE_OS_PROBER \ @@ -12,10 +12,10 @@ index 516be86..5f37db2 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 765bfdc..b148558 100644 +index 2c4bb0a..c7120d2 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in -@@ -115,6 +115,14 @@ cat < Date: Thu, 27 Jun 2013 20:59:00 -0300 Subject: grub-2.00.5043-2: fix .mo files for bzr branch --- libre/grub/PKGBUILD | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 59c7dbe0a..7f7ed7309 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -13,7 +13,7 @@ _GRUB_BZR_REV="5043" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.00.${_GRUB_BZR_REV} -pkgrel=1 +pkgrel=2 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') @@ -182,7 +182,11 @@ build() { ## 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 _build_grub-common_and_bios echo -- cgit v1.2.3 From 288296a46ce416ec762d43b7cc1e9a4c4325993e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 27 Jun 2013 23:49:51 -0300 Subject: grub: fix linguas.sh execution on PKGBUILD --- libre/grub/PKGBUILD | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 7f7ed7309..56d994beb 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -26,7 +26,7 @@ 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') + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr' 'rsync') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' 'fuse: For grub-mount usage' @@ -159,7 +159,7 @@ _build_grub-efi() { } -build() { +prepare() { ## Set ARCH dependent variables if [[ "${CARCH}" == 'x86_64' ]]; then @@ -185,6 +185,13 @@ build() { ## pull in language files ./linguas.sh + +} + +build() { + + cd "${srcdir}/grub-${pkgver}/" + # remove not working langs which need LC_ALL=C.UTF-8 sed -i -e 's#en@cyrillic en@greek##g' po/LINGUAS _build_grub-common_and_bios -- cgit v1.2.3 From 20971c00ce9d6d814104b3a0d3b7bd1e5acf71cb Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 28 Jul 2013 10:13:13 -0300 Subject: grub-2.00.5043-3: fix 10_linux --- libre/grub/PKGBUILD | 22 +++++++++++++--------- libre/grub/grub-2.00-mkinitcpio-0.15.patch | 11 +++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 libre/grub/grub-2.00-mkinitcpio-0.15.patch (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 56d994beb..72517680b 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -13,7 +13,7 @@ _GRUB_BZR_REV="5043" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.00.${_GRUB_BZR_REV} -pkgrel=2 +pkgrel=3 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') @@ -40,19 +40,20 @@ optdepends=('freetype2: For grub-mkfont usage' source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}" 'parabola_grub_mkconfig_fixes.patch' '60_memtest86+' - 'grub.default') + 'grub.default' + 'grub-2.00-mkinitcpio-0.15.patch') +md5sums=('SKIP' + 'b3068b52b6f1dcd2850b5c7585bb185f' + 'be55eabc102f2c60b38ed35c203686d6' + '52d374e0194e3f2e39ff7c92ecd58a6c' + 'd25d2dcf8ba708dcf768fcaea799f59c' + 'SKIP' + 'SKIP') for _DIR_ in 915resolution ntldr-img ; do source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=") done -# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' -sha1sums=('SKIP' - '513172d91d1a2e2cda7c0a744c766d5868cb28bf' - '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559' - '06b926320cb2add6c157d59d46e553b89dd3aa03' - 'SKIP' - 'SKIP') _build_grub-common_and_bios() { @@ -169,6 +170,9 @@ prepare() { fi cd "${srcdir}/grub-${pkgver}/" + + ## fix 10_linux + patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch new file mode 100644 index 000000000..1af848fa3 --- /dev/null +++ b/libre/grub/grub-2.00-mkinitcpio-0.15.patch @@ -0,0 +1,11 @@ +--- util/grub.d/10_linux.in.old 2013-07-28 08:55:47.825946239 +0200 ++++ util/grub.d/10_linux.in 2013-07-28 08:56:14.082201512 +0200 +@@ -138,7 +138,7 @@ + message="$(gettext_printf "Loading Linux %s ..." "${version}")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' +- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} ++ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args} + EOF + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. -- cgit v1.2.3 From d18ef2452dff30319d4aa989f9deecb5966d8795 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 28 Jul 2013 10:21:23 -0300 Subject: grub-2.00.5043-3: fix blank spaces on PKGBUILD --- libre/grub/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 72517680b..2221fb7fe 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -170,13 +170,13 @@ prepare() { fi cd "${srcdir}/grub-${pkgver}/" - - ## fix 10_linux - patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo + + ## fix 10_linux + patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" ## 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" -- cgit v1.2.3 From fef4d5b1dc3c282916e79ae6680f3fc5bbea772b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 6 Aug 2013 17:32:49 -0300 Subject: grub-2.00.5086-1: updating version, fix https://bugs.archlinux.org/task/36349 --- libre/grub/PKGBUILD | 9 +- libre/grub/archlinux_grub_mkconfig_fixes.patch | 143 ++++++++++++++++++++++++ libre/grub/grub-2.00.5086-fix-lvm-parsing.patch | 54 +++++++++ 3 files changed, 203 insertions(+), 3 deletions(-) create mode 100644 libre/grub/archlinux_grub_mkconfig_fixes.patch create mode 100644 libre/grub/grub-2.00.5086-fix-lvm-parsing.patch (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 2221fb7fe..1db67d42d 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva -_GRUB_BZR_REV="5043" +_GRUB_BZR_REV="5086" ## grub-extras lua and gpxe fail to build with grub bzr rev 5043 @@ -13,7 +13,7 @@ _GRUB_BZR_REV="5043" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.00.${_GRUB_BZR_REV} -pkgrel=3 +pkgrel=1 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') @@ -41,12 +41,14 @@ source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revisio 'parabola_grub_mkconfig_fixes.patch' '60_memtest86+' 'grub.default' - 'grub-2.00-mkinitcpio-0.15.patch') + 'grub-2.00-mkinitcpio-0.15.patch' + 'grub-2.00.5086-fix-lvm-parsing.patch') md5sums=('SKIP' 'b3068b52b6f1dcd2850b5c7585bb185f' 'be55eabc102f2c60b38ed35c203686d6' '52d374e0194e3f2e39ff7c92ecd58a6c' 'd25d2dcf8ba708dcf768fcaea799f59c' + '7a0ce6aa4a23fa12e1f79ab03fe63f88' 'SKIP' 'SKIP') @@ -177,6 +179,7 @@ prepare() { ## fix 10_linux patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" + patch -Np1 -i "${srcdir}/grub-2.00.5086-fix-lvm-parsing.patch" ## 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" diff --git a/libre/grub/archlinux_grub_mkconfig_fixes.patch b/libre/grub/archlinux_grub_mkconfig_fixes.patch new file mode 100644 index 000000000..acbb9a7a8 --- /dev/null +++ b/libre/grub/archlinux_grub_mkconfig_fixes.patch @@ -0,0 +1,143 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 8decc1d..170047f 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -212,6 +212,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_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index 2c4bb0a..c7120d2 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -125,6 +125,14 @@ cat < + +--- + util/getroot.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/util/getroot.c b/util/getroot.c +index 2ad8a55..3afcf96 100644 +--- a/util/getroot.c ++++ b/util/getroot.c +@@ -1322,7 +1322,7 @@ grub_util_get_dev_abstraction (const char *os_dev) + static void + pull_lvm_by_command (const char *os_dev) + { +- char *argv[6]; ++ char *argv[8]; + int fd; + pid_t pid; + FILE *mdadm; +@@ -1351,12 +1351,17 @@ pull_lvm_by_command (const char *os_dev) + + /* execvp has inconvenient types, hence the casts. None of these + strings will actually be modified. */ ++ /* by default PV name is left aligned in 10 character field, meaning that ++ we do not know where name ends. Using dummy --separator disables ++ alignment. We have a single field, so separator itself is not output */ + argv[0] = (char *) "vgs"; + argv[1] = (char *) "--options"; + argv[2] = (char *) "pv_name"; + argv[3] = (char *) "--noheadings"; +- argv[4] = vgname; +- argv[5] = NULL; ++ argv[4] = (char *) "--separator"; ++ argv[5] = (char *) ":"; ++ argv[6] = vgname; ++ argv[7] = NULL; + + pid = exec_pipe (argv, &fd); + free (vgname); +@@ -1376,6 +1381,7 @@ pull_lvm_by_command (const char *os_dev) + while (getline (&buf, &len, mdadm) > 0) + { + char *ptr; ++ /* LVM adds two spaces as standard prefix */ + for (ptr = buf; ptr < buf + 2 && *ptr == ' '; ptr++); + if (*ptr == '\0') + continue; -- cgit v1.2.3 From 6e22af065509352a0c77a14245a13723a3c666b7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 12 Aug 2013 14:51:55 -0300 Subject: grub: updating md5sums --- libre/grub/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre/grub/PKGBUILD') diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 1db67d42d..ea12eb9ad 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -48,7 +48,7 @@ md5sums=('SKIP' 'be55eabc102f2c60b38ed35c203686d6' '52d374e0194e3f2e39ff7c92ecd58a6c' 'd25d2dcf8ba708dcf768fcaea799f59c' - '7a0ce6aa4a23fa12e1f79ab03fe63f88' + 'b2bafd4aeb098580754e71991ab7eed8' 'SKIP' 'SKIP') -- cgit v1.2.3