diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-04 12:43:41 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-04 12:45:53 +0000 |
| commit | 29f0a4dcb6162bdabcda3a888230dd2d1d737090 (patch) | |
| tree | 3daa844fb6e2f25ac5398e4f5721c6c083ccf9af /main/grub | |
| parent | 77d043d6be8d72bf020af11ee66c49795c41759b (diff) | |
| download | aports-29f0a4dcb6162bdabcda3a888230dd2d1d737090.tar.bz2 aports-29f0a4dcb6162bdabcda3a888230dd2d1d737090.tar.xz | |
main/grub: avoid pull in gettext for C.UTF-8
LANG=C.UTF-8 is the default in alpine and this confuses grub. Fix this
in 00_header so "C.UTF-8" is trated as "C".
fixes #10816
Diffstat (limited to 'main/grub')
| -rw-r--r-- | main/grub/APKBUILD | 4 | ||||
| -rw-r--r-- | main/grub/lang-C.UTF-8.patch | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD index b222f27b8a..614a6ebc1d 100644 --- a/main/grub/APKBUILD +++ b/main/grub/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=grub pkgver=2.02 -pkgrel=17 +pkgrel=18 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !s390x" @@ -44,6 +44,7 @@ source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz f2fs-support.patch alpine-intel-ucode.patch alpine-xen-initramfs.patch + lang-C.UTF-8.patch 0001-xen-Add-some-Xen-headers.patch 0002-loader-linux-Support-passing-RSDP-address-via-boot-p.patch @@ -243,6 +244,7 @@ ce788fa909bb89a3ccabbc144bb46226373cf846ffe1f315b0bf8b02403220d95c8fe67baf3c37c4 e4e7716cef9f183810eade57751617595c5d5fac740223a5ac3ed13e2215bbb38781328a3f8da3d4c71dd39ffec55d27d3e55b55c189dce55748e9a8512d4b41 f2fs-support.patch ef30930acf817cb2d3721c78f89976a706b502419843ecbf938983a2076ee6a812fb914eb8d74014054b356325c0a72ae3f4416c4b22e5e86ebd8200304446d5 alpine-intel-ucode.patch e683a647757956349c25e3c4e0be8d2e4f78287ba588c497f21942677b207f33a33fa4293cbe71665760dd31b752af02e1353896858cdb2f8d4368116878d5b1 alpine-xen-initramfs.patch +f23702741f2a37c83d0cbf16a000a6229dfd433cd583f3254d523ce35b3668c1db2d8a704a75013e74655ec4f9da5db6b630aa92e3ca5cc47df44cc9e41d1806 lang-C.UTF-8.patch 9daf00b36108852a7443ce4b5b1114d2e87cbfc72148b7847508965ff0dfab14b3f56980a0110c82170f5c2b75ef7a337a15398f59a4cb7e6404227499bffd9a 0001-xen-Add-some-Xen-headers.patch 33505273a8525aa4b44acba69f1b7f0dbee144809fb86626879895d44ce7eed889abf442644fc96536b4ebf86ab7c84a982749fc1181976e89e59a5cf7f7944e 0002-loader-linux-Support-passing-RSDP-address-via-boot-p.patch 1e446051930a96078e2b22831f53e939affdcee371e35e45d87efb8bdf02e2eea03247b7636525daf7d9306ec47cd4351e4d74abe357d19658b0b3fc884f9343 0003-xen-Carve-out-grant-tab-initialization-into-dedicate.patch diff --git a/main/grub/lang-C.UTF-8.patch b/main/grub/lang-C.UTF-8.patch new file mode 100644 index 0000000000..0b74654bcb --- /dev/null +++ b/main/grub/lang-C.UTF-8.patch @@ -0,0 +1,13 @@ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index 93a9023..130abd4 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -191,7 +191,7 @@ EOF + EOF + + # Gettext variables and module +-if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "x" ]; then ++if [ "x${LANG%.UTF-8}" != "xC" ] && [ "x${LANG}" != "x" ]; then + cat << EOF + set locale_dir=\$prefix/locale + set lang=${grub_lang} |