From 12592917a5b472f8ff39955f7a195b27b8990659 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Wed, 17 Jul 2019 20:21:30 +0700 Subject: [PATCH] grub: add defaults --- core/grub/build | 9 +++++++++ core/grub/checksums | 1 + core/grub/sources | 1 + core/grub/version | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/core/grub/build b/core/grub/build index 8fae9bc4..5b4afcc9 100755 --- a/core/grub/build +++ b/core/grub/build @@ -7,6 +7,9 @@ # Grub is built in a function so the script argument needs to be stored. pkg_dir=$1 +# Change naming from GNU/Linux to Linux. +sed 's|GNU/Linux|Linux|' -i grub/util/grub.d/10_linux.in + build_grub() ( cp -R grub "grub-${1##*=}" cd "grub-${1##*=}" @@ -27,6 +30,9 @@ build_grub() ( build_grub --with-platform=pc build_grub --with-platform=efi --disable-efiemu +# Install /etc/default/grub (used by grub-mkconfig). +install -Dm0644 grub.default "$1/etc/default/grub" + # Remove gdb debugging files. ( cd "$pkg_dir" @@ -37,3 +43,6 @@ build_grub --with-platform=efi --disable-efiemu rm -f usr/lib/grub/*/gmodule.pl rm -f usr/lib/charset.alias ) ||: + +# Remove unneedded file by musl +rm -f "$1/usr/lib/charset.alias" diff --git a/core/grub/checksums b/core/grub/checksums index b1c07eba..c7af5291 100644 --- a/core/grub/checksums +++ b/core/grub/checksums @@ -1,3 +1,4 @@ 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f grub-2.02.tar.xz dd64709462eb8218e88c1c4298fb6c0f3c5a741438509226c641b60cbd7818bd 0008-Fix-packed-not-aligned-error-on-GCC-8.patch 55802405cfd186ce9a0f4f166c82538dbd71fb2526af2217e023789c208f26d3 grub-2.02-relocation_fix-1.patch +93cde7ed22280bf1bf205d1e2c9700c64d8d32bd759569f6e00913ec001389c5 grub.default diff --git a/core/grub/sources b/core/grub/sources index f76a7fa5..1d62c642 100644 --- a/core/grub/sources +++ b/core/grub/sources @@ -1,3 +1,4 @@ ftp://ftp.gnu.org/gnu/grub/grub-2.02.tar.xz grub/ patches/0008-Fix-packed-not-aligned-error-on-GCC-8.patch grub/ patches/grub-2.02-relocation_fix-1.patch grub/ +files/grub.default diff --git a/core/grub/version b/core/grub/version index 1f8bbb14..281c6ef9 100644 --- a/core/grub/version +++ b/core/grub/version @@ -1 +1 @@ -2.02 1 +2.02 2