util-iso-grub: create unicode fontinstead of copying

bin/mkchroot.in

@@ -102,6 +102,9 @@ basestrap -Gc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" ${cache_dirs[@]/#
 
 echo "$chroot_version" > "$working_dir/.artools"
 
+if [[ ! -f "$working_dir/etc/locale.gen.orig" ]];then
+    mv "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.orig"
+fi
 printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
 echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
 

bin/mkchrootpkg.in

@@ -212,7 +212,7 @@ _chrootbuild() {
 
     # workaround meson locale errors
     # supposedly fixed with coming python-3.7
-    locale-gen &> /dev/null
+    #locale-gen &> /dev/null
 
     sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
 

lib/util-iso-grub.sh

@@ -53,7 +53,7 @@ configure_grub(){
 
 prepare_grub(){
     local platform=i386-pc img='core.img' grub=$3/boot/grub efi=$3/efi/boot \
-        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub data=$1/usr/share/grub
+        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub
 
     prepare_dir ${grub}/${platform}
 
@@ -81,9 +81,11 @@ prepare_grub(){
 
     prepare_dir ${grub}/themes
     cp -r ${theme}/themes/artix ${grub}/themes/
-    cp ${data}/unicode.pf2 ${grub}
     cp -r ${theme}/{locales,tz} ${grub}
 
+    msg2 "Creating %s ..." "unicode.pf2"
+    grub-mkfont -o ${grub}/unicode.pf2 /usr/share/fonts/misc/unifont.bdf
+
     local size=4M mnt="${mnt_dir}/efiboot" efi_img="$3/efi.img"
     msg2 "Creating fat image of %s ..." "${size}"
     truncate -s ${size} "${efi_img}"

lib/util-iso.sh

@@ -213,6 +213,10 @@ clean_up_image(){
     local path mnt="$1"
     msg2 "Cleaning [%s]" "${mnt##*/}"
 
+    if [[ -f "$mnt/etc/locale.gen.orig" ]];then
+        mv "$mnt/etc/locale.gen.orig" "$mnt/etc/locale.gen"
+        rm "$mnt/etc/locale.conf"
+    fi
     path=$mnt/boot
     if [[ -d "$path" ]]; then
         find "$path" -name 'initramfs*.img' -delete &> /dev/null