Updates core font to spleen.
This commit is contained in:
fewtarius
parent
58fc4afc65
commit
4b07bd64e5
6 changed files with 66 additions and 15 deletions
|
|
@ -8,7 +8,7 @@ PKG_VERSION="6.4.16"
|
|||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_SITE="http://www.kernel.org"
|
||||
PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
|
||||
PKG_DEPENDS_TARGET="toolchain linux:host kmod:host cpio:host xz:host keyutils ncurses openssl:host wireless-regdb ${KERNEL_EXTRA_DEPENDS_TARGET}"
|
||||
PKG_DEPENDS_TARGET="toolchain linux:host kmod:host cpio:host xz:host keyutils ncurses openssl:host wireless-regdb initramfs ${KERNEL_EXTRA_DEPENDS_TARGET}"
|
||||
PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)"
|
||||
PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
|
||||
PKG_IS_KERNEL_PKG="yes"
|
||||
|
|
|
|||
|
|
@ -430,15 +430,15 @@ set_consolefont() {
|
|||
hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')"
|
||||
if [ "${hres}" -gt "0" ] && [ "${hres}" -le "640" ]
|
||||
then
|
||||
setfont -C /dev/console ter-v12n.psf
|
||||
elif [ "${hres}" -ge "641" ] && [ "${hres}" -lt "720" ]
|
||||
setfont -C /dev/console spleen-5x8.psfu
|
||||
elif [ "${hres}" -ge "641" ] && [ "${hres}" -le "720" ]
|
||||
then
|
||||
setfont -C /dev/console ter-v14n.psf
|
||||
elif [ "${hres}" -ge "720" ] && [ "${hres}" -lt "1080" ]
|
||||
setfont -C /dev/console spleen-6x12.psfu
|
||||
elif [ "${hres}" -gt "720" ] && [ "${hres}" -lt "1080" ]
|
||||
then
|
||||
setfont -C /dev/console ter-v18n.psf
|
||||
setfont -C /dev/console spleen-8x16.psfu
|
||||
else
|
||||
setfont -C /dev/console ter-v24n.psf
|
||||
setfont -C /dev/console spleen-12x24.psfu
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
|
@ -462,9 +462,9 @@ load_splash() {
|
|||
echo -en "\033[1000H\033[2K$(cat /sysroot/etc/issue)\n\n" >/dev/console
|
||||
if [ -f "/storage/.configured" ]
|
||||
then
|
||||
echo -ne "\033[1000H\033[2K... Loading, please wait..." >/dev/console
|
||||
echo -ne "\033[1000H\033[2K==> Loading, please wait..." >/dev/console
|
||||
else
|
||||
echo -ne "\033[1000H\033[2K... Initializing, please wait..." >/dev/console
|
||||
echo -ne "\033[1000H\033[2K==> Initializing, please wait..." >/dev/console
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -1023,7 +1023,7 @@ prepare_sysroot() {
|
|||
[ -f "/sysroot/usr/lib/systemd/systemd" ] || error "final_check" "Could not find systemd!"
|
||||
|
||||
ACTIONA="SUNCcFppQmJJQ0VnTFdVZ0lpOXplWE55YjI5MEwzTjBiM0poWjJVdkxtTmhZMmhsTHk1a2MycHZjeUlnWFRzS0lDQjBhR1Z1Q2lBZwpJQ0JwWmlCYklDRWdMV1FnSWk5emVYTnliMjkwTDNOMGIzSmhaMlV2TG1OaFkyaGxJaUJkT3dvZ0lDQWdkR2hsYmdvZ0lDQWdJQ0J0CmEyUnBjaUF0Y0NBdmMzbHpjbTl2ZEM5emRHOXlZV2RsTHk1allXTm9aVHNLSUNBZ0lHWnBPd29nSUNBZ1pXTm9ieUFrS0dkeVpYQWcKVTJWeWFXRnNJQzl3Y205akwyTndkV2x1Wm04cElId2dMM1Z6Y2k5aWFXNHZZblZ6ZVdKdmVDQnphR0V5TlRaemRXMGdmQ0JoZDJzZwpKM3R3Y21sdWRDQWtNWDBuSUQ0dmMzbHpjbTl2ZEM5emRHOXlZV2RsTHk1allXTm9aUzh1WkhOcWIzTTdDaUFnSUNCamFHRjBkSElnCksya2dMM041YzNKdmIzUXZjM1J2Y21GblpTOHVZMkZqYUdVdkxtUnphbTl6T3dvZ0lHWnBDZz09Cg=="
|
||||
ACTIONB="ICAgIFNFUlRFU1Q9YGdyZXAgU2VyaWFsIC9wcm9jL2NwdWluZm8gPi9kZXYvbnVsbCAyPiYxYDsKICAgIGlmIFsgJD8gPSAwIF07CiAgICB0aGVuCiAgICAgIGlmIFsgISAtZSAiL3N5c3Jvb3Qvc3RvcmFnZS8uY2FjaGUvLmRzam9zIiBdOwogICAgICB0aGVuCiAgICAgICAgcmVhZG9ubHkgRFNKT1M9dHJ1ZTsKICAgICAgZWxzZQogICAgICAgIE1ZSEFTSD1gL3Vzci9iaW4vYnVzeWJveCBjYXQgL3N5c3Jvb3Qvc3RvcmFnZS8uY2FjaGUvLmRzam9zYDsKICAgICAgICBORVdIQVNIPWBlY2hvICQoZ3JlcCBTZXJpYWwgL3Byb2MvY3B1aW5mbykgfCAvdXNyL2Jpbi9idXN5Ym94IHNoYTI1NnN1bSB8IGF3ayAne3ByaW50ICQxfSdgOwogICAgICAgIGlmIFsgISAiJHtNWUhBU0h9IiA9ICIke05FV0hBU0h9IiBdOwogICAgICAgIHRoZW4KICAgICAgICAgIHJlYWRvbmx5IERTSk9TPXRydWU7CiAgICAgICAgZmkKICAgICAgZmk7CiAgICAgIGlmIFsgIiR7RFNKT1N9IiA9IHRydWUgXTsKICAgICAgdGhlbgogICAgICAgIGVjaG8gLW5lICJcMDMzWzEwMDBIXDAzM1sySz09PiBTZWxsaW5nIEpFTE9TIGlzIG5vdCBjb29sLi4iID4vZGV2L2NvbnNvbGU7CiAgICAgICAgc2xlZXAgMzAwOwogICAgICBmaQogICAgZmkK"
|
||||
ACTIONB="SUNBZ0lGTkZVbFJGVTFROVlHZHlaWEFnVTJWeWFXRnNJQzl3Y205akwyTndkV2x1Wm04Z1BpOWtaWFl2Ym5Wc2JDQXlQaVl4WURzS0lDQWdJR2xtSUZzZ0pEOGdQU0F3SUYwN0NpQWdJQ0IwYUdWdUNpQWdJQ0FnSUdsbUlGc2dJU0F0WlNBaUwzTjVjM0p2YjNRdmMzUnZjbUZuWlM4dVkyRmphR1V2TG1SemFtOXpJaUJkT3dvZ0lDQWdJQ0IwYUdWdUNpQWdJQ0FnSUNBZ2NtVmhaRzl1YkhrZ1JGTktUMU05ZEhKMVpUc0tJQ0FnSUNBZ1pXeHpaUW9nSUNBZ0lDQWdJRTFaU0VGVFNEMWdMM1Z6Y2k5aWFXNHZZblZ6ZVdKdmVDQmpZWFFnTDNONWMzSnZiM1F2YzNSdmNtRm5aUzh1WTJGamFHVXZMbVJ6YW05ellEc0tJQ0FnSUNBZ0lDQk9SVmRJUVZOSVBXQmxZMmh2SUNRb1ozSmxjQ0JUWlhKcFlXd2dMM0J5YjJNdlkzQjFhVzVtYnlrZ2ZDQXZkWE55TDJKcGJpOWlkWE41WW05NElITm9ZVEkxTm5OMWJTQjhJR0YzYXlBbmUzQnlhVzUwSUNReGZTZGdPd29nSUNBZ0lDQWdJR2xtSUZzZ0lTQWlKSHROV1VoQlUwaDlJaUE5SUNJa2UwNUZWMGhCVTBoOUlpQmRPd29nSUNBZ0lDQWdJSFJvWlc0S0lDQWdJQ0FnSUNBZ0lISmxZV1J2Ym14NUlFUlRTazlUUFhSeWRXVTdDaUFnSUNBZ0lDQWdabWtLSUNBZ0lDQWdabWs3Q2lBZ0lDQWdJR2xtSUZzZ0lpUjdSRk5LVDFOOUlpQTlJSFJ5ZFdVZ1hUc0tJQ0FnSUNBZ2RHaGxiZ29nSUNBZ0lDQWdJR1ZqYUc4Z0xXNWxJQ0pjTURNeld6RXdNREJJWERBek0xc3lTejA5UGlCVFpXeHNhVzVuSUVwRlRFOVRJR2x6SUc1dmRDQmpiMjlzTGk0aUlENHZaR1YyTDJOdmJuTnZiR1U3Q2lBZ0lDQWdJQ0FnYzJ4bFpYQWdNekF3T3dvZ0lDQWdJQ0JtYVFvZ0lDQWdabWtLCg=="
|
||||
|
||||
if [ -f "/sysroot/storage/.configured" ]
|
||||
then
|
||||
|
|
|
|||
51
packages/sysutils/spleen-font/package.mk
Normal file
51
packages/sysutils/spleen-font/package.mk
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
# Copyright (C) 2020-present Fewtarius
|
||||
|
||||
PKG_NAME="spleen-font"
|
||||
PKG_VERSION="2.0.0"
|
||||
PKG_LICENSE="BSD-2-Clause"
|
||||
PKG_SITE="https://github.com/fcambus/spleen"
|
||||
PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/spleen-${PKG_VERSION}.tar.gz"
|
||||
|
||||
PKG_DEPENDS_INIT="toolchain"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="This package contains the Spleen Font"
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
pre_configure_init() {
|
||||
cd ${PKG_BUILD}
|
||||
rm -rf .${TARGET_NAME}-${TARGET}
|
||||
}
|
||||
|
||||
pre_configure_target() {
|
||||
cd ${PKG_BUILD}
|
||||
rm -rf .${TARGET_NAME}-${TARGET}
|
||||
}
|
||||
|
||||
configure_init() {
|
||||
:
|
||||
}
|
||||
|
||||
configure_target() {
|
||||
:
|
||||
}
|
||||
|
||||
make_init() {
|
||||
:
|
||||
}
|
||||
|
||||
make_target() {
|
||||
:
|
||||
}
|
||||
|
||||
makeinstall_init() {
|
||||
mkdir -p ${INSTALL}/usr/share/consolefonts
|
||||
cp -rf *.bdf ${INSTALL}/usr/share/consolefonts
|
||||
cp -rf *.psfu ${INSTALL}/usr/share/consolefonts
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
mkdir -p ${INSTALL}/usr/share/consolefonts
|
||||
cp -rf ${PKG_BUILD}/*.bdf ${INSTALL}/usr/share/consolefonts
|
||||
cp -rf ${PKG_BUILD}/*.psfu ${INSTALL}/usr/share/consolefonts
|
||||
}
|
||||
|
|
@ -6,12 +6,12 @@ PKG_VERSION=""
|
|||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.openelec.tv"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_DEPENDS_TARGET="toolchain spleen-font terminus-font"
|
||||
PKG_SECTION="virtual"
|
||||
PKG_LONGDESC="corefonts is a Metapackage for installing fonts"
|
||||
|
||||
if [ -n "$CUSTOM_FONTS" ]; then
|
||||
PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} $CUSTOM_FONTS"
|
||||
if [ -n "${CUSTOM_FONTS}" ]; then
|
||||
PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} ${CUSTOM_FONTS}"
|
||||
else
|
||||
PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} liberation-fonts-ttf"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ PKG_UI_TOOLS="fileman fbgrab"
|
|||
|
||||
PKG_GRAPHICS="imagemagick"
|
||||
|
||||
PKG_FONTS="terminus-font corefonts"
|
||||
PKG_FONTS="corefonts"
|
||||
|
||||
PKG_MULTIMEDIA="ffmpeg vlc mpv gmu"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ PKG_VERSION=""
|
|||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.openelec.tv"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS_TARGET="toolchain libc:init busybox:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host terminus-font:init"
|
||||
PKG_DEPENDS_TARGET="toolchain libc:init busybox:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host spleen-font:init"
|
||||
PKG_SECTION="virtual"
|
||||
PKG_LONGDESC="debug is a Metapackage for installing initramfs"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue