From d7b8d0a22e2db94e4287aa55d1fc3d86cc25c8ee Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 12 Oct 2018 22:08:35 +0100
Subject: sys-boot/grub : help grub find unifont (for mkfont support)

---
 packages/sys-boot/grub/grub.exlib | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/sys-boot/grub/grub.exlib b/packages/sys-boot/grub/grub.exlib
index d1a681d..3ed4f91 100644
--- a/packages/sys-boot/grub/grub.exlib
+++ b/packages/sys-boot/grub/grub.exlib
@@ -69,19 +69,24 @@ grub_src_prepare() {
 
     autotools_src_prepare
 
+    if option mkfont; then
+        edo cp -ax "${ROOT}"/usr/share/fonts/X11/unifont/unifont.pcf.gz unifont.pcf.gz
+        edo gzip -d unifont.pcf.gz
+    fi
+
     if option themes; then
-        cp -ax "${ROOT}"/usr/share/fonts/X11/dejavu/DejaVuSans.ttf DejaVuSans.ttf
+        edo cp -ax "${ROOT}"/usr/share/fonts/X11/dejavu/DejaVuSans.ttf DejaVuSans.ttf
     fi
 }
 
 
 grub_src_multibuild_prepare() {
     if option efi; then
-        cp -ax "${WORK}" "${WORK}"-efi
+        edo cp -ax "${WORK}" "${WORK}"-efi
     fi
 
     if option pc; then
-        cp -ax "${WORK}" "${WORK}"-pc
+        edo cp -ax "${WORK}" "${WORK}"-pc
     fi
 }
 
@@ -93,7 +98,7 @@ grub_src_configure() {
     grub_src_multibuild_prepare
 
     if option efi; then
-        pushd "${WORK}"-efi
+        edo pushd "${WORK}"-efi
 
         myconf=(
             "CPP=${CC} -E"
@@ -123,7 +128,7 @@ grub_src_configure() {
     fi
 
     if option pc; then
-        pushd "${WORK}"-pc
+        edo pushd "${WORK}"-pc
 
         myconf=(
             "CPP=${CC} -E"
@@ -155,25 +160,25 @@ grub_src_configure() {
 
 grub_src_compile() {
     if option efi; then
-        pushd "${WORK}"-efi
+        edo pushd "${WORK}"-efi
         emake
     fi
 
     if option pc; then
-        pushd "${WORK}"-pc
+        edo pushd "${WORK}"-pc
         emake
     fi
 }
 
 grub_src_install() {
     if option efi; then
-        pushd "${WORK}"-efi
+        edo pushd "${WORK}"-efi
         emake DESTDIR="${IMAGE}" install
         edo rm -rf "${WORK}"-efi
     fi
 
     if option pc; then
-        pushd "${WORK}"-pc
+        edo pushd "${WORK}"-pc
         emake DESTDIR="${IMAGE}" install
         edo rm -rf "${WORK}"-pc
     fi
-- 
cgit v1.2.3