diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch (renamed from libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/09_parabola (renamed from libre/grub/09_parabola) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/60_memtest86+ (renamed from libre/grub/60_memtest86+) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/PKGBUILD (renamed from libre/grub/PKGBUILD) | 11 | ||||
| -rw-r--r-- | libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch (renamed from libre/grub/grub-10_linux-detect-parabola-initramfs.patch) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch (renamed from libre/grub/grub-10_linux-rebrand-free-distros.patch) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/grub-2.00-fix-docs.patch (renamed from libre/grub/grub-2.00-fix-docs.patch) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/grub-2.00-mkinitcpio-0.15.patch (renamed from libre/grub/grub-2.00-mkinitcpio-0.15.patch) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/grub-2.00.5086-fix-lvm-parsing.patch (renamed from libre/grub/grub-2.00.5086-fix-lvm-parsing.patch) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch (renamed from libre/grub/grub-add-GRUB_COLOR_variables.patch) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/grub.default (renamed from libre/grub/grub.default) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/grub.install (renamed from libre/grub/grub.install) | 0 | ||||
| -rw-r--r-- | libre/grub-parabola/parabola_grub_mkconfig_fixes.patch (renamed from libre/grub/parabola_grub_mkconfig_fixes.patch) | 0 |
13 files changed, 6 insertions, 5 deletions
diff --git a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch index e043633af..e043633af 100644 --- a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch +++ b/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch diff --git a/libre/grub/09_parabola b/libre/grub-parabola/09_parabola index 90a9062a3..90a9062a3 100644 --- a/libre/grub/09_parabola +++ b/libre/grub-parabola/09_parabola diff --git a/libre/grub/60_memtest86+ b/libre/grub-parabola/60_memtest86+ index 086f0cc84..086f0cc84 100644 --- a/libre/grub/60_memtest86+ +++ b/libre/grub-parabola/60_memtest86+ diff --git a/libre/grub/PKGBUILD b/libre/grub-parabola/PKGBUILD index 213e7dee0..a4c4bfb9f 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub-parabola/PKGBUILD @@ -21,7 +21,8 @@ _UNIFONT_VER="6.3.20131217" [[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64" [[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386" -pkgname="grub" +_pkgname="grub" +pkgname="grub-parabola" pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.02.beta2 pkgrel=4 @@ -30,12 +31,12 @@ url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') backup=('etc/default/grub' 'etc/grub.d/40_custom') -install="${pkgname}.install" +install="${_pkgname}.install" options=('!makeflags') -conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy') -replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") -provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") +conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy' 'grub') +replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub') +provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" "grub=$pkgver") makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') diff --git a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch index 18d9d520c..18d9d520c 100644 --- a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch +++ b/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch diff --git a/libre/grub/grub-10_linux-rebrand-free-distros.patch b/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch index 7edb22a1f..7edb22a1f 100644 --- a/libre/grub/grub-10_linux-rebrand-free-distros.patch +++ b/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch diff --git a/libre/grub/grub-2.00-fix-docs.patch b/libre/grub-parabola/grub-2.00-fix-docs.patch index 0aa481154..0aa481154 100644 --- a/libre/grub/grub-2.00-fix-docs.patch +++ b/libre/grub-parabola/grub-2.00-fix-docs.patch diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub-parabola/grub-2.00-mkinitcpio-0.15.patch index 1af848fa3..1af848fa3 100644 --- a/libre/grub/grub-2.00-mkinitcpio-0.15.patch +++ b/libre/grub-parabola/grub-2.00-mkinitcpio-0.15.patch diff --git a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch b/libre/grub-parabola/grub-2.00.5086-fix-lvm-parsing.patch index 9a2eb3ff7..9a2eb3ff7 100644 --- a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch +++ b/libre/grub-parabola/grub-2.00.5086-fix-lvm-parsing.patch diff --git a/libre/grub/grub-add-GRUB_COLOR_variables.patch b/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch index c113a81d5..c113a81d5 100644 --- a/libre/grub/grub-add-GRUB_COLOR_variables.patch +++ b/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch diff --git a/libre/grub/grub.default b/libre/grub-parabola/grub.default index 56585a47d..56585a47d 100644 --- a/libre/grub/grub.default +++ b/libre/grub-parabola/grub.default diff --git a/libre/grub/grub.install b/libre/grub-parabola/grub.install index 9188b357a..9188b357a 100644 --- a/libre/grub/grub.install +++ b/libre/grub-parabola/grub.install diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub-parabola/parabola_grub_mkconfig_fixes.patch index 6e3a524f0..6e3a524f0 100644 --- a/libre/grub/parabola_grub_mkconfig_fixes.patch +++ b/libre/grub-parabola/parabola_grub_mkconfig_fixes.patch |