diff options
| author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-09-27 18:20:44 -0300 |
|---|---|---|
| committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-09-27 18:20:44 -0300 |
| commit | b9d06f3e95d1818b26114417b29ab66f439c2a30 (patch) | |
| tree | 6607fbb6588aee6446510b742445b980cde6d34b | |
| parent | eaf3d6f308094aca4f87ed111c2580e81b18f269 (diff) | |
| download | abslibre-b9d06f3e95d1818b26114417b29ab66f439c2a30.tar.gz abslibre-b9d06f3e95d1818b26114417b29ab66f439c2a30.tar.bz2 abslibre-b9d06f3e95d1818b26114417b29ab66f439c2a30.zip | |
grub: disable temp 915resolution, and fix xen support
| -rw-r--r-- | libre/grub/PKGBUILD | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 5f801f6f9..a0f936481 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -52,7 +52,7 @@ if [[ "${CARCH}" == "armv7h" ]]; then fi makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' - 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'xen') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' 'fuse: For grub-mount usage' @@ -61,8 +61,11 @@ optdepends=('freetype2: For grub-mkfont usage' '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') -if [[ "${CARCH}" == "i686" ]]; then - optdepends+=('linux-libre-xen: For XEN server host support') +if [[ "${CARCH}" == "x86_64" ]]; then + optdepends+=('xen: For boot support into XEN server') +elif [[ "${CARCH}" == "i686" ]]; then + optdepends+=('xen: For boot support into XEN server' + 'linux-libre-xen: For boot support into XEN server') fi if [[ "${_GRUB_EMU_BUILD}" == "1" ]] && [[ "${CARCH}" != "armv7h" ]]; then @@ -154,7 +157,7 @@ _build_grub-common_and_bios() { msg "Add the grub-extra sources for BIOS build" install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras" - cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-bios/grub-extras/915resolution" +# cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-bios/grub-extras/915resolution" # failed in compilation export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-bios/grub-extras/" msg "Unset all compiler FLAGS for BIOS build" @@ -257,7 +260,7 @@ _build_grub-qemu() { msg "Add the grub-extra sources for QEMU build" install -d "${srcdir}/grub-${_pkgver}-qemu/grub-extras" - cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-qemu/grub-extras/915resolution" +# cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-qemu/grub-extras/915resolution" # failed in compilation export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-qemu/grub-extras/" msg "Unset all compiler FLAGS for QEMU build" @@ -311,7 +314,7 @@ _build_grub-ieee1275() { msg "Add the grub-extra sources for IEEE1275 (OpenFirmware) build" install -d "${srcdir}/grub-${_pkgver}-ieee1275/grub-extras" - cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-ieee1275/grub-extras/915resolution" +# cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-ieee1275/grub-extras/915resolution" # failed in compilation export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-ieee1275/grub-extras/" msg "Unset all compiler FLAGS for IEEE1275 (OpenFirmware) build" @@ -365,7 +368,7 @@ _build_grub-libreboot() { msg "Add the grub-extra sources for Libreboot build" install -d "${srcdir}/grub-${_pkgver}-libreboot/grub-extras" - cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-libreboot/grub-extras/915resolution" +# cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-libreboot/grub-extras/915resolution" # failed in compilation export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-libreboot/grub-extras/" msg "Unset all compiler FLAGS for Libreboot build" @@ -419,7 +422,7 @@ _build_grub-multiboot() { msg "Add the grub-extra sources for Multiboot build" install -d "${srcdir}/grub-${_pkgver}-multiboot/grub-extras" - cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-multiboot/grub-extras/915resolution" +# cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-multiboot/grub-extras/915resolution" # failed in compilation export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-multiboot/grub-extras/" msg "Unset all compiler FLAGS for Multiboot build" @@ -519,6 +522,11 @@ _build_grub-xen() { msg "Copy the source for building the ${_XEN_ARCH} XEN part" cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-xen-${_XEN_ARCH}" cd "${srcdir}/grub-${_pkgver}-xen-${_XEN_ARCH}/" + + msg "Add the grub-extra sources for Multiboot build" + install -d "${srcdir}/grub-${_pkgver}-multiboot/grub-extras" +# cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-multiboot/grub-extras/915resolution" # failed in compilation + export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-multiboot/grub-extras/" msg "Unset all compiler FLAGS for ${_XEN_ARCH} XEN build" unset CFLAGS |