webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stevee/grub-unifont' into install-raid

Browse Source
This commit is contained in:
Michael Tremer
2014-09-04 20:21:05 +02:00
parent 5be66d81b9 e4d62bc2ab
commit 28191cfc5b
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/grub2/default
View File

@@ -4,3 +4,4 @@ GRUB_DEFAULT=saved
GRUB_CMDLINE_LINUX="panic=10" GRUB_CMDLINE_LINUX="panic=10"
GRUB_DISABLE_RECOVERY="true" GRUB_DISABLE_RECOVERY="true"
GRUB_BACKGROUND="/boot/grub/splash.png" GRUB_BACKGROUND="/boot/grub/splash.png"
GRUB_FONT="/boot/grub/unifont.pf2"

2
config/rootfiles/common/i586/grub
View File

@@ -1,6 +1,7 @@
#boot/grub #boot/grub
boot/grub/grub.cfg boot/grub/grub.cfg
boot/grub/splash.png boot/grub/splash.png
boot/grub/unifont.pf2
#etc/bash_completion.d #etc/bash_completion.d
#etc/bash_completion.d/grub #etc/bash_completion.d/grub
etc/default/grub etc/default/grub
@@ -17,6 +18,7 @@ usr/bin/grub-editenv
usr/bin/grub-fstest usr/bin/grub-fstest
usr/bin/grub-kbdcomp usr/bin/grub-kbdcomp
usr/bin/grub-menulst2cfg usr/bin/grub-menulst2cfg
usr/bin/grub-mkfont
usr/bin/grub-mkimage usr/bin/grub-mkimage
usr/bin/grub-mklayout usr/bin/grub-mklayout
usr/bin/grub-mkpasswd-pbkdf2 usr/bin/grub-mkpasswd-pbkdf2

12
lfs/grub
View File

@@ -40,11 +40,14 @@ CXXFLAGS =
# Top-level Rules # Top-level Rules
############################################################################### ###############################################################################
objects = $(DL_FILE) objects = $(DL_FILE) \
unifont-7.0.03.pcf.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz
$(DL_FILE)_MD5 = a1043102fbc7bcedbf53e7ee3d17ab91 $(DL_FILE)_MD5 = a1043102fbc7bcedbf53e7ee3d17ab91
unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401
install : $(TARGET) install : $(TARGET)
@@ -97,5 +100,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Disable hardening. # Disable hardening.
paxctl -mpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe paxctl -mpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
# We don't need to install unifont just to generate a grub2 compatible
# font archive for the graphical boot menu. The following command only
# converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters.
/usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \
--range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \
$(DIR_DL)/unifont-7.0.03.pcf.gz
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

2
make.sh
View File

@@ -401,6 +401,7 @@ buildipfire() {
ipfiremake dracut ipfiremake dracut
ipfiremake lvm2 ipfiremake lvm2
ipfiremake multipath-tools ipfiremake multipath-tools
ipfiremake freetype
ipfiremake grub ipfiremake grub
case "${TARGET_ARCH}" in case "${TARGET_ARCH}" in
@@ -488,7 +489,6 @@ buildipfire() {
ipfiremake libpng ipfiremake libpng
ipfiremake libtiff ipfiremake libtiff
ipfiremake libart ipfiremake libart
ipfiremake freetype
ipfiremake gd ipfiremake gd
ipfiremake popt ipfiremake popt
ipfiremake pcre ipfiremake pcre