pool/grub2
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 229108 from home:arvidjaar:grub2-next

Browse Source 
- rename grub2.chrp back into grub.chrp, otherwise it is not found by
  grub tools
- replace grub2-use-DejaVuSansMono-for-starfield-theme.patch with
  grub2-use-Unifont-for-starfield-theme-terminal.patch - use Unifont
  font for terminal window

OBS-URL: https://build.opensuse.org/request/show/229108
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=84
This commit is contained in:
Michael Chang 2014-04-07 03:38:20 +00:00 committed by Git OBS Bridge
parent 395270c067
commit 2f3c8bd3cd
4 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
grub2-use-DejaVuSansMono-for-starfield-theme.patch
View File

@ -1,15 +0,0 @@
Index: grub-2.02~beta2/configure.ac
===================================================================
--- grub-2.02~beta2.orig/configure.ac
+++ grub-2.02~beta2/configure.ac
@@ -1376,8 +1376,8 @@ fi
if test x"$starfield_excuse" = x; then
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
- if test -f "$dir/DejaVuSans.$ext"; then
- DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
+ if test -f "$dir/DejaVuSansMono.$ext"; then
+ DJVU_FONT_SOURCE="$dir/DejaVuSansMono.$ext"
break 2
fi
done

15
grub2-use-Unifont-for-starfield-theme-terminal.patch Normal file
View File

@ -0,0 +1,15 @@
DejaVu Sans is proportional font and looks pretty bad in terminal
window. Use GNU Unifont instead.
Index: grub-2.02~beta2/themes/starfield/theme.txt
===================================================================
--- grub-2.02~beta2.orig/themes/starfield/theme.txt
+++ grub-2.02~beta2/themes/starfield/theme.txt
@@ -25,7 +25,7 @@ message-font: "DejaVu Sans Regular 12"
message-color: "#000"
message-bg-color: "#fff"
terminal-box: "terminal_box_*.png"
-terminal-font: "DejaVu Sans Regular 12"
+terminal-font: "Gnu Unifont Mono Regular 16"
desktop-image: "starfield.png"
#help bar at the bottom

9
grub2.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Apr 5 14:27:45 UTC 2014 - arvidjaar@gmail.com
- rename grub2.chrp back into grub.chrp, otherwise it is not found by
grub tools
- replace grub2-use-DejaVuSansMono-for-starfield-theme.patch with
grub2-use-Unifont-for-starfield-theme-terminal.patch - use Unifont
font for terminal window
-------------------------------------------------------------------
Thu Feb 27 04:30:07 UTC 2014 - mchang@suse.com

11
grub2.spec
View File

@ -136,7 +136,7 @@ Patch29: grub2-secureboot-chainloader.patch
Patch34: grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
Patch35: grub2-linguas.sh-no-rsync.patch
Patch36: 0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
Patch37: grub2-use-DejaVuSansMono-for-starfield-theme.patch
Patch37: grub2-use-Unifont-for-starfield-theme-terminal.patch
Patch38: grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
# Btrfs snapshot booting related patches
Patch101: 0002-btrfs-add-ability-to-boot-from-subvolumes.patch
@ -473,6 +473,12 @@ install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub
install -m 755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/grub2-once
install -m 755 -D %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/snapper/plugins/grub
%ifarch ppc ppc64 ppc64le
# Rename grub2.chrp back to grub.chrp so it is found by tools
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/%{grubarch}/%{name}.chrp \
$RPM_BUILD_ROOT%{_libdir}/%{name}/%{grubarch}/grub.chrp
%endif
%find_lang %{name}
%fdupes %buildroot%{_bindir}
@ -697,7 +703,8 @@ fi
%defattr(-,root,root,-)
%dir %{_libdir}/%{name}/%{grubarch}
%ifarch ppc ppc64 ppc64le
%{_libdir}/%{name}/%{grubarch}/%{name}.chrp
# This is intentionally "grub.chrp" and not "%{name}.chrp"
%{_libdir}/%{name}/%{grubarch}/grub.chrp
%{_libdir}/%{name}/%{grubarch}/bootinfo.txt
%endif
%ifnarch ppc ppc64 ppc64le s390x