vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-07-23 Robert Millan <rmh@aybabtu.com>

Browse source 
* Makefile.in (UNICODE_ARROWS, UNICODE_LINES): New variables (they
        define the codes for arrows and lines used for the menu).
        (ascii.pff): Generate fonts for $(UNICODE_ARROWS) and $(UNICODE_LINES)
        as well.

        * util/update-grub_lib.in (font_path): Prefer ascii.pff over complete
        fonts, because the latter are too slow.
This commit is contained in:
robertmh 2008-07-22 22:23:45 +00:00
parent 18eeaf04d7
commit 12ccdb75a9
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-07-23 Robert Millan <rmh@aybabtu.com>
* Makefile.in (UNICODE_ARROWS, UNICODE_LINES): New variables (they
define the codes for arrows and lines used for the menu).
(ascii.pff): Generate fonts for $(UNICODE_ARROWS) and $(UNICODE_LINES)
as well.
* util/update-grub_lib.in (font_path): Prefer ascii.pff over complete
fonts, because the latter are too slow.
2008-07-21 Bean <bean123ch@gmail.com> 2008-07-21 Bean <bean123ch@gmail.com>
* kern/i386/pc/startup.S (gate_a20_try_bios): Change test order for * kern/i386/pc/startup.S (gate_a20_try_bios): Change test order for

7
Makefile.in
View file

@ -143,11 +143,16 @@ partmap.lst: $(PARTMAPFILES)
ifeq (, $(UNIFONT_HEX)) ifeq (, $(UNIFONT_HEX))
else else
pkgdata_DATA += unicode.pff ascii.pff pkgdata_DATA += unicode.pff ascii.pff
# Arrows and lines are needed to draw the menu, so we always include them
UNICODE_ARROWS=0x2190-0x2193
UNICODE_LINES=0x2501-0x251B
unicode.pff: $(UNIFONT_HEX) unicode.pff: $(UNIFONT_HEX)
ruby $(srcdir)/util/unifont2pff.rb $(UNIFONT_HEX) > $@ ruby $(srcdir)/util/unifont2pff.rb $(UNIFONT_HEX) > $@
ascii.pff: $(UNIFONT_HEX) ascii.pff: $(UNIFONT_HEX)
ruby $(srcdir)/util/unifont2pff.rb 0-127 $(UNIFONT_HEX) > $@ ruby $(srcdir)/util/unifont2pff.rb 0x0-0x7f $(UNICODE_ARROWS) $(UNICODE_LINES) $(UNIFONT_HEX) > $@
endif endif
all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(MKFILES) all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(MKFILES)

5
util/update-grub_lib.in
View file

@ -131,8 +131,9 @@ prepare_grub_to_access_device ()
font_path () font_path ()
{ {
for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
# Prefer complete fonts over incomplete ones. # FIXME: We prefer ascii because loading complete fonts is too slow (and
for basename in unicode unifont ascii ; do # we don't yet provide the gettext magic that would make unicode useful).
for basename in ascii unicode unifont ; do
path="${dir}/${basename}.pff" path="${dir}/${basename}.pff"
if is_path_readable_by_grub ${path} > /dev/null ; then if is_path_readable_by_grub ${path} > /dev/null ; then
echo "${path}" echo "${path}"