Merge pull request #10248 from heitbaum/backport

[le12.2] Backport of cleanups
This commit is contained in:
Matthias Reichl 2025-07-21 16:09:12 +02:00 committed by GitHub
commit eeb031ea08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
108 changed files with 515 additions and 520 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
# build directorys # build directories
/build.*/ /build.*/
/builds /builds
/.fakeroot.* /.fakeroot.*

View File

@ -3,7 +3,7 @@
set -e set -e
# setup initial directorys (relative to root) # setup initial directories (relative to root)
CONFIG=config CONFIG=config
SCRIPTS=scripts SCRIPTS=scripts
PACKAGES=packages PACKAGES=packages

View File

@ -63,7 +63,7 @@ show_config() {
config_message+="\n - Include firmware:\t\t\t ${config_firmware}" config_message+="\n - Include firmware:\t\t\t ${config_firmware}"
done done
# Image Filsystem # Image Filesystem
config_message+="\n\n Image Filesystems:" config_message+="\n\n Image Filesystems:"
config_message+="\n ${dashes}${dashes}" config_message+="\n ${dashes}${dashes}"

View File

@ -142,7 +142,7 @@
# build with MySQL support (mariadb / none) # build with MySQL support (mariadb / none)
KODI_MYSQL_SUPPORT="mariadb" KODI_MYSQL_SUPPORT="mariadb"
# build xbmc with optical drive support (yes / no) # build Kodi with optical drive support (yes / no)
KODI_OPTICAL_SUPPORT="yes" KODI_OPTICAL_SUPPORT="yes"
# build with AirPlay support (stream videos from iDevices to KODI) (yes / no) # build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
@ -219,7 +219,7 @@
# mediacenter also automount internally drives at boottime via udev (yes / no) # mediacenter also automount internally drives at boottime via udev (yes / no)
UDEVIL="yes" UDEVIL="yes"
# Support for partitioning and formating disks in initramfs (yes / no) # Support for partitioning and formatting disks in initramfs (yes / no)
# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage # This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
INITRAMFS_PARTED_SUPPORT="no" INITRAMFS_PARTED_SUPPORT="no"

View File

@ -52,7 +52,7 @@ rm -f ${CONTROL_FILE} ${DATA_FILE}
rm -f ${CONTROL_FILE} ${DATA_FILE} rm -f ${CONTROL_FILE} ${DATA_FILE}
## extract chrome ## extract chrome
# extrat chrome.deb data to temp # extract chrome.deb data to temp
kodi-send --action="Notification(Extracting Chrome,starting,1000,${ICON})" >/dev/null kodi-send --action="Notification(Extracting Chrome,starting,1000,${ICON})" >/dev/null
deb_extract_data ${CHROME_FILE} $ADDON_DIR/tmp_download deb_extract_data ${CHROME_FILE} $ADDON_DIR/tmp_download

View File

@ -17,7 +17,7 @@ then
. $ADDON_HOME/env . $ADDON_HOME/env
fi fi
# fix file permissons (zip packaging) # fix file permissions (zip packaging)
chmod +x $ADDON_DIR/chrome-bin/chrome chmod +x $ADDON_DIR/chrome-bin/chrome
chmod 4755 $ADDON_DIR/chrome-bin/chrome-sandbox chmod 4755 $ADDON_DIR/chrome-bin/chrome-sandbox

View File

@ -71,7 +71,7 @@ if [ -z "$(pidof userhdhomerun)" ]; then
[ "$DVBMODE" = "auto" ] && DVBMODE="" [ "$DVBMODE" = "auto" ] && DVBMODE=""
# remove setttings for this tuner # remove settings for this tuner
awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^tuner_type=|^use_full_name=|^disable=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-types awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^tuner_type=|^use_full_name=|^disable=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-types
mv ${DVBHDHOMERUN_CONF_TMP}-types $DVBHDHOMERUN_CONF_TMP mv ${DVBHDHOMERUN_CONF_TMP}-types $DVBHDHOMERUN_CONF_TMP
echo "" >>$DVBHDHOMERUN_CONF_TMP echo "" >>$DVBHDHOMERUN_CONF_TMP

View File

@ -189,7 +189,7 @@ if [ -z "$(pidof mediasrv)" ]; then
[ ! -f $KEYMAP ] && KEYMAP="" [ ! -f $KEYMAP ] && KEYMAP=""
# remove setttings for this tuner # remove settings for this tuner
awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^[^\[]|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^[^\[]|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types
mv ${SUNDTEK_CONF_TMP}-types $SUNDTEK_CONF_TMP mv ${SUNDTEK_CONF_TMP}-types $SUNDTEK_CONF_TMP
echo "" >>$SUNDTEK_CONF_TMP echo "" >>$SUNDTEK_CONF_TMP

View File

@ -1 +1 @@
# Nothing needed in this file, just rename to boblight.X11 if not using XBMC addon # Nothing needed in this file, just rename to boblight.X11 if not using Kodi addon

View File

@ -34,7 +34,7 @@ inotify=yes
enable_tivo=no enable_tivo=no
# set this to beacon to use legacy broadcast discovery method # set this to beacon to use legacy broadcast discovery method
# defauts to bonjour if avahi is available # defaults to bonjour if avahi is available
tivo_discovery=bonjour tivo_discovery=bonjour
# set this to strictly adhere to DLNA standards. # set this to strictly adhere to DLNA standards.

View File

@ -194,7 +194,7 @@ state_file "/storage/.kodi/userdata/addon_data/service.multimedia.mpd/state"
# #
# A BIG FAT WARNING # A BIG FAT WARNING
# #
# This may block your xbmc audio. It might also play no audio at all, # This may block your Kodi audio. It might also play no audio at all,
# if streamsilence is enabled and you try to use the very same device. # if streamsilence is enabled and you try to use the very same device.
# #
############################################################################### ###############################################################################

View File

@ -8,7 +8,7 @@ PKG_LICENSE="LGPL"
PKG_SITE="https://mariadb.org/" PKG_SITE="https://mariadb.org/"
PKG_URL="https://github.com/mariadb-corporation/mariadb-connector-c/archive/v${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/mariadb-corporation/mariadb-connector-c/archive/v${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_DEPENDS_TARGET="toolchain zlib openssl"
PKG_LONGDESC="mariadb-connector: library to conntect to mariadb/mysql database server" PKG_LONGDESC="mariadb-connector: library to connect to mariadb/mysql database server"
PKG_BUILD_FLAGS="-gold" PKG_BUILD_FLAGS="-gold"
PKG_CMAKE_OPTS_TARGET="-DWITH_EXTERNAL_ZLIB=ON PKG_CMAKE_OPTS_TARGET="-DWITH_EXTERNAL_ZLIB=ON

View File

@ -27,7 +27,7 @@ PKG_CMAKE_OPTS_COMMON="-DBUILD_EXTERNAL=ON \
-Wno-dev" -Wno-dev"
post_unpack() { post_unpack() {
# Enables SPIR-V optimzer capability needed for ENABLE_OPT CMake build option # Enables SPIR-V optimizer capability needed for ENABLE_OPT CMake build option
mkdir -p ${PKG_BUILD}/External/spirv-tools/external/spirv-headers mkdir -p ${PKG_BUILD}/External/spirv-tools/external/spirv-headers
cp -R $(get_build_dir spirv-tools)/* ${PKG_BUILD}/External/spirv-tools cp -R $(get_build_dir spirv-tools)/* ${PKG_BUILD}/External/spirv-tools
cp -R $(get_build_dir spirv-headers)/* ${PKG_BUILD}/External/spirv-tools/external/spirv-headers cp -R $(get_build_dir spirv-headers)/* ${PKG_BUILD}/External/spirv-tools/external/spirv-headers

View File

@ -59,6 +59,6 @@ pre_make_target() {
} }
post_makeinstall_target() { post_makeinstall_target() {
# Clean up - two graphic test tools are superflous # Clean up - two graphic test tools are superfluous
safe_remove ${INSTALL}/usr/bin/vkcubepp safe_remove ${INSTALL}/usr/bin/vkcubepp
} }

View File

@ -0,0 +1,33 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="tm16xx"
PKG_VERSION="9148a4e12ba6cf4b375a7fd352667f7f27823426"
PKG_SHA256="e8fbbc5c8c36b3eb42f1f8d7c907106ccf3a2b5af4b2382c6ca4ea63e07fde70"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/jefflessard/tm16xx-display/"
PKG_URL="https://github.com/jefflessard/tm16xx-display/archive/${PKG_VERSION}.tar.gz"
PKG_LONGDESC="Linux kernel driver for auxiliary displays using TM1628 compatible controllers"
PKG_IS_KERNEL_PKG="yes"
pre_make_target() {
unset LDFLAGS
}
make_target() {
kernel_make V=1 KDIR=$(kernel_path) module
}
makeinstall_target() {
mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
mkdir -p ${INSTALL}/usr/sbin
cp display-service ${INSTALL}/usr/sbin
cp display-utils ${INSTALL}/usr/sbin
mkdir -p ${INSTALL}/usr/lib/systemd/system
cp display.service ${INSTALL}/usr/lib/systemd/system
}
post_install() {
enable_service display.service
}

View File

@ -5,8 +5,8 @@
PKG_NAME="linux" PKG_NAME="linux"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.kernel.org" PKG_SITE="http://www.kernel.org"
PKG_DEPENDS_HOST="ccache:host rsync:host" PKG_DEPENDS_HOST="ccache:host"
PKG_DEPENDS_TARGET="linux:host kmod:host xz:host keyutils openssl:host ${KERNEL_EXTRA_DEPENDS_TARGET}" PKG_DEPENDS_TARGET="linux:host kmod:host keyutils openssl:host ${KERNEL_EXTRA_DEPENDS_TARGET}"
PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)" 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_LONGDESC="This package contains a precompiled kernel image and the modules."
PKG_IS_KERNEL_PKG="yes" PKG_IS_KERNEL_PKG="yes"
@ -62,6 +62,10 @@ if [[ "${KERNEL_TARGET}" = uImage* ]]; then
PKG_DEPENDS_TARGET+=" u-boot-tools:host" PKG_DEPENDS_TARGET+=" u-boot-tools:host"
fi fi
if [ "${BOOTLOADER}" = "bcm2835-bootloader" -a "${TARGET_KERNEL_ARCH}" = "arm64" ]; then
PKG_DEPENDS_TARGET+=" pigz:host"
fi
# Ensure that the dependencies of initramfs:target are built correctly, but # Ensure that the dependencies of initramfs:target are built correctly, but
# we don't want to add initramfs:target as a direct dependency as we install # we don't want to add initramfs:target as a direct dependency as we install
# this "manually" from within linux:target # this "manually" from within linux:target
@ -137,12 +141,6 @@ pre_make_target() {
${PKG_BUILD}/scripts/config ${OPTION} CONFIG_ISCSI_IBFT_FIND ${PKG_BUILD}/scripts/config ${OPTION} CONFIG_ISCSI_IBFT_FIND
${PKG_BUILD}/scripts/config ${OPTION} CONFIG_ISCSI_IBFT ${PKG_BUILD}/scripts/config ${OPTION} CONFIG_ISCSI_IBFT
# disable lima/panfrost if libmali is configured
if [ "${OPENGLES}" = "libmali" ]; then
${PKG_BUILD}/scripts/config --disable CONFIG_DRM_LIMA
${PKG_BUILD}/scripts/config --disable CONFIG_DRM_PANFROST
fi
# disable wireguard support if not enabled # disable wireguard support if not enabled
if [ ! "${WIREGUARD_SUPPORT}" = yes ]; then if [ ! "${WIREGUARD_SUPPORT}" = yes ]; then
${PKG_BUILD}/scripts/config --disable CONFIG_WIREGUARD ${PKG_BUILD}/scripts/config --disable CONFIG_WIREGUARD

View File

@ -8,4 +8,4 @@ PKG_LICENSE="MIT"
PKG_SITE="https://github.com/elFarto/nvidia-vaapi-driver" PKG_SITE="https://github.com/elFarto/nvidia-vaapi-driver"
PKG_URL="https://github.com/elFarto/nvidia-vaapi-driver/archive/v${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/elFarto/nvidia-vaapi-driver/archive/v${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain libva nv-codec-headers gst-plugins-bad" PKG_DEPENDS_TARGET="toolchain libva nv-codec-headers gst-plugins-bad"
PKG_LONGDESC="A VA-API implemention using NVIDIA's NVDEC" PKG_LONGDESC="A VA-API implementation using NVIDIA's NVDEC"

View File

@ -98,7 +98,7 @@ But not always. To select a specific toolchain, you only need to set the `PKG_TO
| configure | preconfigured [GNU Build System](https://en.wikipedia.org/wiki/GNU_Build_System) | | configure | preconfigured [GNU Build System](https://en.wikipedia.org/wiki/GNU_Build_System) |
| ninja | [Ninja Build](https://ninja-build.org/) | | ninja | [Ninja Build](https://ninja-build.org/) |
| make | [Makefile Based](https://www.gnu.org/software/make/) | | make | [Makefile Based](https://www.gnu.org/software/make/) |
| manual | only runs self writen build steps, see [Functions](#functions) | | manual | only runs self written build steps, see [Functions](#functions) |
###### Auto-Detection ###### Auto-Detection
The auto-detections looks for specific files in the source path. The auto-detections looks for specific files in the source path.
@ -158,8 +158,8 @@ Full list of overwrittable functions.
| pre_build_\[stage] | yes | Runs before of the start of the build | | pre_build_\[stage] | yes | Runs before of the start of the build |
| pre_configure<br>pre_configure_\[stage]<br>configure_\[stage]<br>post_configure_\[stage] | yes | Configure the package for the compile. This is only relevant for toolchain, that supports it (e.g. meson, cmake, configure, manual) | | pre_configure<br>pre_configure_\[stage]<br>configure_\[stage]<br>post_configure_\[stage] | yes | Configure the package for the compile. This is only relevant for toolchain, that supports it (e.g. meson, cmake, configure, manual) |
| make_\[stage]<br>pre_make_\[stage]<br>post_make_\[stage] | yes | Build of the package | | make_\[stage]<br>pre_make_\[stage]<br>post_make_\[stage] | yes | Build of the package |
| makeinstall_\[stage]<br>pre_makeinstall_\[stage]<br>post_makeinstall_\[stage] | yes | Installation of the files in the correct pathes<br>host: TOOLCHAIN<br>target: SYSROOT and IMAGE<br>bootstrap and init: temporary destination | makeinstall_\[stage]<br>pre_makeinstall_\[stage]<br>post_makeinstall_\[stage] | yes | Installation of the files in the correct paths<br>host: TOOLCHAIN<br>target: SYSROOT and IMAGE<br>bootstrap and init: temporary destination
| addon | - | Copy all files together for addon creation. This is requiered for addons | | addon | - | Copy all files together for addon creation. This is required for addons |
| post_install_addon | - | Post processing of installed addon files in `${INSTALL}` directory | | post_install_addon | - | Post processing of installed addon files in `${INSTALL}` directory |
## Directory structure ## Directory structure
@ -271,7 +271,7 @@ Issue | Level | Meaning |
* new kernel driver * new kernel driver
* ... * ...
2. Find a place in the packages tree 2. Find a place in the packages tree
* look into the package tree structure, which is generally self explaind. * look into the package tree structure, which is generally self explanitory.
* do not place it in an existing package (directory that includes a `package.mk`) * do not place it in an existing package (directory that includes a `package.mk`)
* when you found a place, create a directory with the name of your package (use same value for `PKG_NAME`!!) * when you found a place, create a directory with the name of your package (use same value for `PKG_NAME`!!)
3. Create an initial `package.mk` 3. Create an initial `package.mk`
@ -295,7 +295,7 @@ PKG_LICENSE="LGPL"
PKG_SITE="https://mariadb.org/" PKG_SITE="https://mariadb.org/"
PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v$PKG_VERSION.tar.gz" PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_DEPENDS_TARGET="toolchain zlib openssl"
PKG_LONGDESC="mariadb-connector: library to conntect to mariadb/mysql database server" PKG_LONGDESC="mariadb-connector: library to connect to mariadb/mysql database server"
PKG_BUILD_FLAGS="-gold" PKG_BUILD_FLAGS="-gold"
PKG_CMAKE_OPTS_TARGET="-DWITH_EXTERNAL_ZLIB=ON \ PKG_CMAKE_OPTS_TARGET="-DWITH_EXTERNAL_ZLIB=ON \

View File

@ -96,7 +96,7 @@ post_makeinstall_target() {
ln -sf /run/libreelec/cacert.pem ${INSTALL}/etc/ssl/cacert.pem ln -sf /run/libreelec/cacert.pem ${INSTALL}/etc/ssl/cacert.pem
ln -sf /run/libreelec/cacert.pem ${INSTALL}/etc/ssl/cert.pem ln -sf /run/libreelec/cacert.pem ${INSTALL}/etc/ssl/cert.pem
# backwards comatibility # backwards compatibility
mkdir -p ${INSTALL}/etc/pki/tls mkdir -p ${INSTALL}/etc/pki/tls
ln -sf /run/libreelec/cacert.pem ${INSTALL}/etc/pki/tls/cacert.pem ln -sf /run/libreelec/cacert.pem ${INSTALL}/etc/pki/tls/cacert.pem
mkdir -p ${INSTALL}/etc/pki/tls/certs mkdir -p ${INSTALL}/etc/pki/tls/certs

View File

@ -376,14 +376,10 @@ CONFIG_CLEAR=y
# CONFIG_FGCONSOLE is not set # CONFIG_FGCONSOLE is not set
# CONFIG_KBD_MODE is not set # CONFIG_KBD_MODE is not set
# CONFIG_LOADFONT is not set # CONFIG_LOADFONT is not set
CONFIG_SETFONT=y # CONFIG_SETFONT is not set
# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set # CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
CONFIG_DEFAULT_SETFONT_DIR="/usr/share" CONFIG_DEFAULT_SETFONT_DIR=""
# CONFIG_FEATURE_LOADFONT_PSF2 is not set
#
# Common options for loadfont and setfont
#
CONFIG_FEATURE_LOADFONT_PSF2=y
# CONFIG_FEATURE_LOADFONT_RAW is not set # CONFIG_FEATURE_LOADFONT_RAW is not set
# CONFIG_LOADKMAP is not set # CONFIG_LOADKMAP is not set
# CONFIG_OPENVT is not set # CONFIG_OPENVT is not set

View File

@ -120,7 +120,6 @@ makeinstall_target() {
sed -e "s/@DISTRONAME@-@OS_VERSION@/${DISTRONAME}-$OS_VERSION/g" \ sed -e "s/@DISTRONAME@-@OS_VERSION@/${DISTRONAME}-$OS_VERSION/g" \
-i ${INSTALL}/usr/bin/pastebinit -i ${INSTALL}/usr/bin/pastebinit
ln -sf pastebinit ${INSTALL}/usr/bin/paste ln -sf pastebinit ${INSTALL}/usr/bin/paste
cp ${PKG_DIR}/scripts/vfd-clock ${INSTALL}/usr/bin/
mkdir -p ${INSTALL}/usr/sbin mkdir -p ${INSTALL}/usr/sbin
cp ${PKG_DIR}/scripts/kernel-overlays-setup ${INSTALL}/usr/sbin cp ${PKG_DIR}/scripts/kernel-overlays-setup ${INSTALL}/usr/sbin
@ -171,7 +170,6 @@ post_install() {
enable_service ledfix.service enable_service ledfix.service
enable_service shell.service enable_service shell.service
enable_service show-version.service enable_service show-version.service
enable_service vfd-clock.service
enable_service var.mount enable_service var.mount
enable_service locale.service enable_service locale.service
listcontains "${FIRMWARE}" "rpi-eeprom" && enable_service rpi-flash-firmware.service listcontains "${FIRMWARE}" "rpi-eeprom" && enable_service rpi-flash-firmware.service

View File

@ -9,7 +9,7 @@ message="$message\n "
message="$message\n 'apt-get' is a command to install, update and remove software which" message="$message\n 'apt-get' is a command to install, update and remove software which"
message="$message\n is stored in a non local repo. 'apt-get' does nothing then connecting to such" message="$message\n is stored in a non local repo. 'apt-get' does nothing then connecting to such"
message="$message\n repo, downloads the software, unpacks the software, updates a big" message="$message\n repo, downloads the software, unpacks the software, updates a big"
message="$message\n local database with all filepaths and other informations about the" message="$message\n local database with all filepaths and other information about the"
message="$message\n installed software or removes or updates installed Software." message="$message\n installed software or removes or updates installed Software."
message="$message\n " message="$message\n "
message="$message\n With LibreELEC it is not possible to change the system for security and" message="$message\n With LibreELEC it is not possible to change the system for security and"

View File

@ -104,7 +104,7 @@ mkdir -p $BASEDIR/$LOGDIR
getlog_cmd cat /storage/.config/shutdown.sh getlog_cmd cat /storage/.config/shutdown.sh
fi fi
getlog_cmd ls -laR /storage/.config/system.d getlog_cmd ls -laR /storage/.config/system.d
# note: we dont add .mount units here as they may contan # note: we dont add .mount units here as they may contain
# login credentials # login credentials
for i in /storage/.config/system.d/*.service ; do for i in /storage/.config/system.d/*.service ; do
if [ -f "$i" ] && [ ! -L "$i" ]; then if [ -f "$i" ] && [ ! -L "$i" ]; then

View File

@ -20,7 +20,7 @@ if [ -e /storage/.please_resize_me ] ; then
date -Iseconds >>$LOG date -Iseconds >>$LOG
# this sh** was never intended to be used # this sh** was never intended to be used
# on already installed and runing system # on an already installed and running system
if [ -d /storage/.kodi -o -d /storage/.config -o -d /storage/.cache ] ; then if [ -d /storage/.kodi -o -d /storage/.config -o -d /storage/.cache ] ; then
rm -f /storage/.please_resize_me rm -f /storage/.please_resize_me
sync sync

View File

@ -147,7 +147,7 @@ create_edid() {
intel_amd() { intel_amd() {
# check which output is connnected: # check which output is connected:
counter=0 counter=0
for i in /sys/class/drm/*; do for i in /sys/class/drm/*; do
if [ "$(cat "$i"/status 2>/dev/null)" = "connected" ]; then if [ "$(cat "$i"/status 2>/dev/null)" = "connected" ]; then

View File

@ -20,7 +20,7 @@ delete_edid() {
create_edid() { create_edid() {
CONNECTORS=$(dump-active-edids -q) CONNECTORS=$(dump-active-edids -q)
if [ $? -ne 0 -o -z "${CONNECTORS}" ]; then if [ $? -ne 0 -o -z "${CONNECTORS}" ]; then
echo "error: cannot detemine active connectors" echo "error: cannot determine active connectors"
exit 1 exit 1
fi fi
create-edid-cpio -q create-edid-cpio -q

View File

@ -48,8 +48,6 @@ LIVE="no"
BREAK_TRIPPED="no" BREAK_TRIPPED="no"
BIGFONT="1080"
# Get a serial number if present (eg. RPi) otherwise use MAC address from eth0 # Get a serial number if present (eg. RPi) otherwise use MAC address from eth0
MACHINE_UID="$(awk '/^Serial/{s='0000000' $3; print substr(s, length(s) - 7)}' /proc/cpuinfo)" MACHINE_UID="$(awk '/^Serial/{s='0000000' $3; print substr(s, length(s) - 7)}' /proc/cpuinfo)"
[ -z "$MACHINE_UID" ] && MACHINE_UID="$(cat /sys/class/net/eth0/address 2>/dev/null | tr -d :)" [ -z "$MACHINE_UID" ] && MACHINE_UID="$(cat /sys/class/net/eth0/address 2>/dev/null | tr -d :)"
@ -359,18 +357,6 @@ update_bootloader() {
fi fi
} }
set_consolefont() {
local vres
progress "Set console font"
if [ -e /dev/fb0 ]; then
vres="$(fbset 2>/dev/null | awk '/geometry/ { print $3 }')"
if [ $vres -gt "$BIGFONT" ]; then
setfont -C /dev/tty0 ter-v32b.psf
fi
fi
}
load_splash() { load_splash() {
local set_default_res=no local set_default_res=no
local vres local vres
@ -653,7 +639,7 @@ check_out_of_space() {
echo "free space on /storage to complete the update!" echo "free space on /storage to complete the update!"
echo "" echo ""
echo "Please free up space on your /storage partition" echo "Please free up space on your /storage partition"
echo "by deleting unecessary files, then try again." echo "by deleting unnecessary files, then try again."
echo "" echo ""
return 0 return 0
else else
@ -1051,9 +1037,6 @@ for arg in $(cat /proc/cmdline); do
break=*) break=*)
BREAK="${arg#*=}" BREAK="${arg#*=}"
;; ;;
bigfont=*)
BIGFONT="${arg#*=}"
;;
ip=*) ip=*)
KERNEL_IPCONFIG="yes" KERNEL_IPCONFIG="yes"
;; ;;
@ -1079,7 +1062,6 @@ debug_msg "Unique identifier for this client: ${MACHINE_UID:-NOT AVAILABLE}"
# main boot sequence # main boot sequence
for BOOT_STEP in \ for BOOT_STEP in \
set_consolefont \
check_disks \ check_disks \
mount_flash \ mount_flash \
cleanup_flash \ cleanup_flash \

View File

@ -1,46 +0,0 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
do_start(){
while sleep 1
do
printf "%4s" "$(date +'%l %M' | tr -d '[:space:]')" > "$LED_PATH_TEXT"
if [ "$LED_COLON" = "off" ]; then
echo "1" > "$LED_PATH_COLON"
LED_COLON="on"
else
echo "0" > "$LED_PATH_COLON"
LED_COLON="off"
fi
done
}
do_stop(){
echo "0" > "$LED_PATH_COLON"
echo " " > "$LED_PATH_TEXT"
}
case $(dtname) in
oranth,tx3-mini|oranth,tx9-pro|sunvell,t95z-plus)
LED_PATH_COLON="/sys/devices/platform/spi/spi_master/spi0/spi0.0/leds/:colon/brightness"
LED_PATH_TEXT="/sys/devices/platform/spi/spi_master/spi0/spi0.0/display_text"
;;
default|*)
# noop
;;
esac
if [ -n "$LED_PATH_COLON" ] && [ -n "$LED_PATH_TEXT" ]; then
case $1 in
start)
do_start
;;
stop)
do_stop
;;
esac
else
exit 0
fi

View File

@ -1,15 +0,0 @@
[Unit]
Description=VFD Clock Service
After=network-online.target graphical.target
Requires=graphical.target
Wants=kodi.target
[Service]
Type=oneshot
ExecStart=/bin/sh /usr/bin/vfd-clock start
ExecStopPost=/bin/sh /usr/bin/vfd-clock stop
RemainAfterExit=yes
StartLimitInterval=0
[Install]
WantedBy=kodi.target

View File

@ -50,7 +50,7 @@
KEY_BACKSPACE = KEY_EXIT # BACK KEY_BACKSPACE = KEY_EXIT # BACK
alt+KEY_F4 = KEY_CLOSE # Close alt+KEY_F4 = KEY_CLOSE # Close
meta+KEY_D = KEY_INFO # Desktop, remapped to Info in XBMC meta+KEY_D = KEY_INFO # Desktop, remapped to Info in Kodi
KEY_COMPOSE = KEY_EPG # More, remapped to Context Menu in XBMC KEY_COMPOSE = KEY_EPG # More, remapped to Context Menu in Kodi
ctrl+KEY_R = KEY_RECORD # Record ctrl+KEY_R = KEY_RECORD # Record
KEY_ESC = KEY_DELETE # Clear KEY_ESC = KEY_DELETE # Clear

View File

@ -12,5 +12,5 @@
KEY_PVR = KEY_MEDIA # Home KEY_PVR = KEY_MEDIA # Home
KEY_AUX = KEY_CAMERA # Photo KEY_AUX = KEY_CAMERA # Photo
KEY_MENU = KEY_EPG # Menu (used for XBMC's context menu) KEY_MENU = KEY_EPG # Menu (used for Kodi's context menu)
KEY_K = KEY_EPG # Title (used for XBMC's context menu) KEY_K = KEY_EPG # Title (used for Kodi's context menu)

View File

@ -2,7 +2,7 @@
# An example udev rules file for eventlircd. # An example udev rules file for eventlircd.
# #
# This rules file does not start eventlircd. Many applications only check for # This rules file does not start eventlircd. Many applications only check for
# the lircd socket at application lauch. Therefore, it is better to start # the lircd socket at application launch. Therefore, it is better to start
# eventlircd in an init script so that eventlircd creates the lircd socket # eventlircd in an init script so that eventlircd creates the lircd socket
# before any applications that use LIRC launch. # before any applications that use LIRC launch.
################################################################################ ################################################################################

View File

@ -15,8 +15,8 @@ Requires=network-online.service
# 'network-online.service' fails we can not mount and this scripts fails too # 'network-online.service' fails we can not mount and this scripts fails too
After=network-online.service After=network-online.service
# usually we mount networks shares because we want they avaible *before* XBMC starts. # usually we mount network shares because we want them available *before* Kodi starts.
# so XBMC has access to this mounts from beginning. Note: this slows down the boot! # so Kodi has access to mounts from the beginning. Note: this slows down the boot sequence!
Before=kodi.service Before=kodi.service

View File

@ -15,8 +15,8 @@ Requires=network-online.service
# 'network-online.service' fails we can not mount and this scripts fails too # 'network-online.service' fails we can not mount and this scripts fails too
After=network-online.service After=network-online.service
# usually we mount networks shares because we want they avaible *before* XBMC starts. # usually we mount network shares because we want them available *before* Kodi starts.
# so XBMC has access to this mounts from beginning. Note: this slows down the boot! # so Kodi has access to mounts from the beginning. Note: this slows down the boot sequence!
Before=kodi.service Before=kodi.service

View File

@ -127,7 +127,7 @@ post_makeinstall_target() {
safe_remove ${INSTALL}/usr/lib/tmpfiles.d/home.conf safe_remove ${INSTALL}/usr/lib/tmpfiles.d/home.conf
safe_remove ${INSTALL}/usr/share/factory safe_remove ${INSTALL}/usr/share/factory
# remove Network adaper renaming rule, this is confusing # remove Network adapter renaming rule, this is confusing
safe_remove ${INSTALL}/usr/lib/udev/rules.d/80-net-setup-link.rules safe_remove ${INSTALL}/usr/lib/udev/rules.d/80-net-setup-link.rules
safe_remove ${INSTALL}/usr/lib/udev/rules.d/71-seat.rules safe_remove ${INSTALL}/usr/lib/udev/rules.d/71-seat.rules

View File

@ -1,30 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2019 Matthias Reichl <hias@horus.com>
PKG_NAME="terminus-font"
PKG_VERSION="4.49.1"
PKG_SHA256="d961c1b781627bf417f9b340693d64fc219e0113ad3a3af1a3424c7aa373ef79"
PKG_LICENSE="OFL1_1"
PKG_SITE="http://terminus-font.sourceforge.net"
PKG_URL="https://downloads.sourceforge.net/project/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION:0:4}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_INIT="toolchain Python3:host"
PKG_LONGDESC="This package contains the Terminus Font"
PKG_TOOLCHAIN="manual"
pre_configure_init() {
cd ${PKG_BUILD}
rm -rf .${TARGET_NAME}-${TARGET}
}
configure_init() {
./configure INT=${TOOLCHAIN}/bin/python3
}
make_init() {
make ter-v32b.psf
}
makeinstall_init() {
mkdir -p ${INSTALL}/usr/share/consolefonts
cp ter-v32b.psf ${INSTALL}/usr/share/consolefonts
}

View File

@ -253,7 +253,7 @@ allowed_options_exfat = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, gi
# mount_point_mode, if present and set to a non-empty value, will cause udevil # mount_point_mode, if present and set to a non-empty value, will cause udevil
# to set the mode (permissions) on the moint point after mounting If not # to set the mode (permissions) on the mount point after mounting If not
# specified or if left empty, the mode is not changed. Mode must be octal # specified or if left empty, the mode is not changed. Mode must be octal
# starting with a zero (0755). # starting with a zero (0755).
# mount_point_mode_FSTYPE, if present, is used to override mount_point_mode # mount_point_mode_FSTYPE, if present, is used to override mount_point_mode
@ -285,7 +285,7 @@ allowed_options_exfat = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, gi
# validation of a mount or unmount command, beyond the checks performed by # validation of a mount or unmount command, beyond the checks performed by
# udevil. The program is run as a normal user (if root runs udevil, # udevil. The program is run as a normal user (if root runs udevil,
# validate_exec will NOT be run). The program is NOT run if the user is # validate_exec will NOT be run). The program is NOT run if the user is
# mounting a device without root priviledges (a device in fstab). # mounting a device without root privileges (a device in fstab).
# The program is passed the username, a printable description of what is # The program is passed the username, a printable description of what is
# happening, and the entire udevil command line as the first three arguments. # happening, and the entire udevil command line as the first three arguments.
# The program must return an exit status of 0 to allow the mount or unmount # The program must return an exit status of 0 to allow the mount or unmount

View File

@ -94,7 +94,7 @@ get_device_unmount() {
} }
get_partition() { get_partition() {
# get all partitions of a specifed device # get all partitions of a specified device
# usage: get_partitions /dev/sda # usage: get_partitions /dev/sda
# uses: - # uses: -
# provides: PARTITIONS # provides: PARTITIONS

View File

@ -1,5 +1,5 @@
[Unit] [Unit]
Description=XBMC Media Center Description=Kodi Media Center
Requires=installer.target Requires=installer.target
[Service] [Service]

View File

@ -7,7 +7,7 @@ PKG_VERSION=""
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv" PKG_SITE="http://www.openelec.tv"
PKG_URL="" PKG_URL=""
PKG_DEPENDS_INIT="libc:init busybox:init plymouth-lite:init util-linux:init e2fsprogs:init dosfstools:init terminus-font:init" PKG_DEPENDS_INIT="libc:init busybox:init plymouth-lite:init util-linux:init e2fsprogs:init dosfstools:init"
PKG_DEPENDS_TARGET="toolchain initramfs:init" PKG_DEPENDS_TARGET="toolchain initramfs:init"
PKG_SECTION="virtual" PKG_SECTION="virtual"
PKG_LONGDESC="Metapackage for installing initramfs" PKG_LONGDESC="Metapackage for installing initramfs"

View File

@ -3,7 +3,7 @@
# Copy this to ~/.config/sway/config and edit it to your liking. # Copy this to ~/.config/sway/config and edit it to your liking.
# #
# Read `man 5 sway` for a complete reference. # Read `man 5 sway` for a complete reference.
# Load prefered color scheme # Load preferred color scheme
include colorscheme include colorscheme
# Logo key. Use Mod1 for Alt. # Logo key. Use Mod1 for Alt.
set $mod Mod4 set $mod Mod4

View File

@ -9,7 +9,7 @@ PKG_LICENSE="OSS"
PKG_SITE="https://www.X.org" PKG_SITE="https://www.X.org"
PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain util-macros xorgproto" PKG_DEPENDS_TARGET="toolchain util-macros xorgproto"
PKG_LONGDESC="X authorization file management libary" PKG_LONGDESC="X authorization file management library"
PKG_BUILD_FLAGS="+pic" PKG_BUILD_FLAGS="+pic"
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --enable-xthreads" PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --enable-xthreads"

View File

@ -6,22 +6,22 @@
# wait for xorg-configure@.service # wait for xorg-configure@.service
# max 10 seconds # max 10 seconds
ARGS_FILE="/run/libreelec/xorg-settings.conf" ARGS_FILE="/run/libreelec/xorg-settings.conf"
for i in $(seq 1 40) ; do for i in $(seq 1 40); do
if [ -e "$ARGS_FILE" ] ; then if [ -e "$ARGS_FILE" ]; then
break break
fi fi
usleep 250000 usleep 250000
done done
if [ -e "$ARGS_FILE" ] ; then if [ -e "$ARGS_FILE" ]; then
. /run/libreelec/xorg-settings.conf . /run/libreelec/xorg-settings.conf
exec xorg-launch-helper $@ $XORG_ARGS exec xorg-launch-helper $@ $XORG_ARGS
else else
echo "" > /dev/tty1 echo "" >/dev/tty1
echo "failed to start xorg." > /dev/tty1 echo "failed to start xorg." >/dev/tty1
echo "is your GPU supported?" > /dev/tty1 echo "is your GPU supported?" >/dev/tty1
echo "" > /dev/tty1 echo "" >/dev/tty1
lspci -nn > /dev/tty1 lspci -nn >/dev/tty1
echo "" > /dev/tty1 echo "" >/dev/tty1
sleep 30 sleep 30
fi fi

View File

@ -13,7 +13,7 @@ mkdir -p /var/run
# HACK. we have xorg-configure@%. so nice race # HACK. we have xorg-configure@%. so nice race
# can happen on multi-gpu setups # can happen on multi-gpu setups
if [ -e /var/run/xorg-configure.done ] ; then if [ -e /var/run/xorg-configure.done ]; then
exit 0 exit 0
fi fi
@ -26,10 +26,10 @@ logger -t Xorg "creating needed directories and symlinks for driver: "${1}""
logger -t Xorg "### setup xorg.conf paths ###" logger -t Xorg "### setup xorg.conf paths ###"
XORG_CONF_USER="/storage/.config/xorg.conf" XORG_CONF_USER="/storage/.config/xorg.conf"
XORG_CONF_USER_DRV="/storage/.config/xorg-${1}.conf" XORG_CONF_USER_DRV="/storage/.config/xorg-${1}.conf"
XORG_CONF_DEFAULT="/etc/X11/xorg.conf" XORG_CONF_DEFAULT="/etc/X11/xorg.conf"
XORG_CONF_DEFAULT_DRV="/etc/X11/xorg-${1}.conf" XORG_CONF_DEFAULT_DRV="/etc/X11/xorg-${1}.conf"
############################################################################## ##############################################################################
# creating start options # creating start options
@ -37,18 +37,18 @@ logger -t Xorg "### setup xorg.conf paths ###"
logger -t Xorg "### creating start options ###" logger -t Xorg "### creating start options ###"
XORG_ARGS="-s 0 -noreset -allowMouseOpenFail" XORG_ARGS="-s 0 -noreset -allowMouseOpenFail"
# load user defined xorg.conf, if exist # load user defined xorg.conf, if exist
if [ -f "${XORG_CONF_USER}" ]; then if [ -f "${XORG_CONF_USER}" ]; then
XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_USER}" XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_USER}"
elif [ -f "${XORG_CONF_USER_DRV}" ]; then elif [ -f "${XORG_CONF_USER_DRV}" ]; then
XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_USER_DRV}" XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_USER_DRV}"
elif [ -f "${XORG_CONF_DEFAULT}" ]; then elif [ -f "${XORG_CONF_DEFAULT}" ]; then
XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_DEFAULT}" XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_DEFAULT}"
elif [ -f "$XORG_CONF_DEFAULT_DRV" ]; then elif [ -f "$XORG_CONF_DEFAULT_DRV" ]; then
XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_DEFAULT_DRV}" XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_DEFAULT_DRV}"
fi fi
############################################################################## ##############################################################################
# creating needed directories and symlinks # creating needed directories and symlinks
@ -56,55 +56,54 @@ logger -t Xorg "### creating start options ###"
logger -t Xorg "### creating needed directories and symlinks ###" logger -t Xorg "### creating needed directories and symlinks ###"
# Used to support GeForce 600 Series & newer # Used to support GeForce 600 Series & newer
if [ "${1}" = "nvidia" ]; then if [ "${1}" = "nvidia" ]; then
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_VERSION@ /var/lib/libnvidia-ml.so.1 ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_VERSION@ /var/lib/libnvidia-ml.so.1
ln -sf /usr/lib/xorg/modules/drivers/nvidia-main_drv.so /var/lib/nvidia_drv.so ln -sf /usr/lib/xorg/modules/drivers/nvidia-main_drv.so /var/lib/nvidia_drv.so
ln -sf /usr/lib/nvidia/nvidia.ko /var/lib/nvidia.ko ln -sf /usr/lib/nvidia/nvidia.ko /var/lib/nvidia.ko
ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so.1 ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so.1
ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so
ln -sf /usr/bin/nvidia-main-smi /var/lib/nvidia-smi ln -sf /usr/bin/nvidia-main-smi /var/lib/nvidia-smi
ln -sf /usr/bin/nvidia-main-xconfig /var/lib/nvidia-xconfig ln -sf /usr/bin/nvidia-main-xconfig /var/lib/nvidia-xconfig
insmod /var/lib/nvidia.ko insmod /var/lib/nvidia.ko
# GL/GLX (GLVND) # GL/GLX (GLVND)
ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so
ln -sf /usr/lib/libGLX_glvnd.so.0 /var/lib/libGLX.so ln -sf /usr/lib/libGLX_glvnd.so.0 /var/lib/libGLX.so
# indirect rendering # indirect rendering
ln -sf /usr/lib/libGLX_nvidia.so.0 /var/lib/libGLX_indirect.so.0 ln -sf /usr/lib/libGLX_nvidia.so.0 /var/lib/libGLX_indirect.so.0
XORG_ARGS="${XORG_ARGS} -ignoreABI" XORG_ARGS="${XORG_ARGS} -ignoreABI"
# Used to support GeForce 500 Series & older # Used to support GeForce 500 Series & older
elif [ "${1}" = "nvidia-legacy" ]; then elif [ "${1}" = "nvidia-legacy" ]; then
ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGL.so
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia-legacy.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia-legacy.so /var/lib/libglx.so
ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_LEGACY_VERSION@ /var/lib/libnvidia-ml.so.1 ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_LEGACY_VERSION@ /var/lib/libnvidia-ml.so.1
ln -sf /usr/lib/xorg/modules/drivers/nvidia-legacy_drv.so /var/lib/nvidia_drv.so ln -sf /usr/lib/xorg/modules/drivers/nvidia-legacy_drv.so /var/lib/nvidia_drv.so
ln -sf /usr/lib/nvidia-legacy/nvidia.ko /var/lib/nvidia.ko ln -sf /usr/lib/nvidia-legacy/nvidia.ko /var/lib/nvidia.ko
ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so.1 ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so.1
ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so
ln -sf /usr/bin/nvidia-legacy-smi /var/lib/nvidia-smi ln -sf /usr/bin/nvidia-legacy-smi /var/lib/nvidia-smi
ln -sf /usr/bin/nvidia-legacy-xconfig /var/lib/nvidia-xconfig ln -sf /usr/bin/nvidia-legacy-xconfig /var/lib/nvidia-xconfig
insmod /var/lib/nvidia.ko insmod /var/lib/nvidia.ko
# GLX (NON-GLVND) # GLX (NON-GLVND)
ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGLX.so ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGLX.so
# indirect rendering # indirect rendering
ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGLX_indirect.so.0 ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGLX_indirect.so.0
XORG_ARGS="${XORG_ARGS} -ignoreABI" XORG_ARGS="${XORG_ARGS} -ignoreABI"
# Used for AMD & Intel GPUs supported by MESA 3D # Used for AMD & Intel GPUs supported by MESA 3D
else else
ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
# GL/GLX (GLVND) # GL/GLX (GLVND)
ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so
ln -sf /usr/lib/libGLX_glvnd.so.0 /var/lib/libGLX.so ln -sf /usr/lib/libGLX_glvnd.so.0 /var/lib/libGLX.so
# indirect rendering # indirect rendering
ln -sf /usr/lib/libGLX_mesa.so.0 /var/lib/libGLX_indirect.so.0 ln -sf /usr/lib/libGLX_mesa.so.0 /var/lib/libGLX_indirect.so.0
fi fi
################################################################################ ################################################################################
# setup xorg-settings.conf # setup xorg-settings.conf
################################################################################ ################################################################################
logger -t Xorg "### starting Xorg with '${DISPLAY} vt01 ${XORG_ARGS}' ###" logger -t Xorg "### starting Xorg with '${DISPLAY} vt01 ${XORG_ARGS}' ###"
mkdir -p /run/libreelec mkdir -p /run/libreelec
echo "XORG_ARGS=\"${XORG_ARGS}\"" > /run/libreelec/xorg-settings.conf echo "XORG_ARGS=\"${XORG_ARGS}\"" >/run/libreelec/xorg-settings.conf

View File

@ -16,6 +16,3 @@
# KODI Player implementation to use # KODI Player implementation to use
KODIPLAYER_DRIVER="$OPENGLES" KODIPLAYER_DRIVER="$OPENGLES"
# Mali GPU family
MALI_FAMILY="450"

View File

@ -26,7 +26,3 @@
# KODI Player implementation to use # KODI Player implementation to use
KODIPLAYER_DRIVER="$OPENGLES" KODIPLAYER_DRIVER="$OPENGLES"
# Mali GPU family
MALI_FAMILY="450"

View File

@ -63,7 +63,7 @@
# build with MySQL support (mariadb / none) # build with MySQL support (mariadb / none)
KODI_MYSQL_SUPPORT="no" KODI_MYSQL_SUPPORT="no"
# build xbmc with optical drive support (yes / no) # build Kodi with optical drive support (yes / no)
KODI_OPTICAL_SUPPORT="no" KODI_OPTICAL_SUPPORT="no"
# build with AirPlay support (stream videos from iDevices to KODI) (yes / no) # build with AirPlay support (stream videos from iDevices to KODI) (yes / no)

View File

@ -30,9 +30,6 @@
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
OPENGLES="mesa" OPENGLES="mesa"
# Mali GPU family
MALI_FAMILY="400"
# KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap) # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
KODIPLAYER_DRIVER="$OPENGLES" KODIPLAYER_DRIVER="$OPENGLES"

View File

@ -43,10 +43,7 @@
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
OPENGLES="mesa" OPENGLES="mesa"
# Mali GPU family # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
MALI_FAMILY="400"
# KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
KODIPLAYER_DRIVER="$OPENGLES" KODIPLAYER_DRIVER="$OPENGLES"
# set the addon project # set the addon project

View File

@ -43,9 +43,6 @@
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
OPENGLES="mesa" OPENGLES="mesa"
# Mali GPU family
MALI_FAMILY="400"
# KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap) # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
KODIPLAYER_DRIVER="$OPENGLES" KODIPLAYER_DRIVER="$OPENGLES"

View File

@ -30,9 +30,6 @@
# OpenGL-ES implementation to use # OpenGL-ES implementation to use
OPENGLES="mesa" OPENGLES="mesa"
# Mali GPU family
MALI_FAMILY="450"
# KODI Player implementation to use # KODI Player implementation to use
KODIPLAYER_DRIVER="$OPENGLES" KODIPLAYER_DRIVER="$OPENGLES"

View File

@ -40,9 +40,6 @@
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
OPENGLES="mesa" OPENGLES="mesa"
# Mali GPU family
MALI_FAMILY="400"
# KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap) # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
KODIPLAYER_DRIVER="$OPENGLES" KODIPLAYER_DRIVER="$OPENGLES"

View File

@ -5,4 +5,4 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -5,8 +5,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
if [ -f /sys/class/thermal/thermal_zone1/temp ]; then if [ -f /sys/class/thermal/thermal_zone1/temp ]; then
TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)"
else else
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
fi fi
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -209,8 +209,8 @@ CONFIG_INITRAMFS_ROOT_GID=0
# CONFIG_RD_LZO is not set # CONFIG_RD_LZO is not set
CONFIG_RD_LZ4=y CONFIG_RD_LZ4=y
CONFIG_RD_ZSTD=y CONFIG_RD_ZSTD=y
CONFIG_INITRAMFS_COMPRESSION_LZ4=y # CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set
# CONFIG_INITRAMFS_COMPRESSION_ZSTD is not set CONFIG_INITRAMFS_COMPRESSION_ZSTD=y
# CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_INITRAMFS_COMPRESSION_NONE is not set
# CONFIG_BOOT_CONFIG is not set # CONFIG_BOOT_CONFIG is not set
CONFIG_INITRAMFS_PRESERVE_MTIME=y CONFIG_INITRAMFS_PRESERVE_MTIME=y
@ -7149,9 +7149,20 @@ CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_TIME_NS=y CONFIG_GENERIC_VDSO_TIME_NS=y
CONFIG_FONT_SUPPORT=y CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set CONFIG_FONTS=y
CONFIG_FONT_8x8=y CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y CONFIG_FONT_8x16=y
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_6x10 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_STACKWALK=y
CONFIG_STACKDEPOT=y CONFIG_STACKDEPOT=y

View File

@ -37,11 +37,11 @@ CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZO=y
CONFIG_HAVE_KERNEL_LZ4=y CONFIG_HAVE_KERNEL_LZ4=y
# CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZO is not set
CONFIG_KERNEL_LZ4=y # CONFIG_KERNEL_LZ4 is not set
CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_INIT=""
CONFIG_DEFAULT_HOSTNAME="@DISTRONAME@" CONFIG_DEFAULT_HOSTNAME="@DISTRONAME@"
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
@ -6641,9 +6641,20 @@ CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_32=y CONFIG_GENERIC_VDSO_32=y
CONFIG_FONT_SUPPORT=y CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set CONFIG_FONTS=y
CONFIG_FONT_8x8=y CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y CONFIG_FONT_8x16=y
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_6x10 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_STACKWALK=y
CONFIG_STACKDEPOT=y CONFIG_STACKDEPOT=y

View File

@ -9,7 +9,7 @@
KERNEL_MAKE_EXTRACMD="dtbs" KERNEL_MAKE_EXTRACMD="dtbs"
# Additional kernel dependencies # Additional kernel dependencies
KERNEL_EXTRA_DEPENDS_TARGET="lz4:host" KERNEL_EXTRA_DEPENDS_TARGET=""
# Kernel to use. values can be: # Kernel to use. values can be:
# default: default mainline kernel # default: default mainline kernel

View File

@ -5,7 +5,7 @@
# detect legacy kernel installs and abort to prevent upgrades # detect legacy kernel installs and abort to prevent upgrades
case $(uname -r) in case $(uname -r) in
3.14*|4.9*) 3.14* | 4.9*)
echo "Updates from Amlogic vendor kernels are not supported!" echo "Updates from Amlogic vendor kernels are not supported!"
sleep 10 sleep 10
exit 1 exit 1

View File

@ -10,7 +10,7 @@ FIPDIR="$(get_build_dir amlogic-boot-fip)"
case "${UBOOT_SYSTEM}" in case "${UBOOT_SYSTEM}" in
box|"") box|"")
# no-op, use vendor booloader # no-op, use vendor bootloader
;; ;;
*) *)
mkdir "${DESTDIR}/tmp" mkdir "${DESTDIR}/tmp"

View File

@ -8,56 +8,64 @@
[ -z "$BOOT_PART" ] && BOOT_PART=$(df "$BOOT_ROOT" | tail -1 | awk {' print $1 '}) [ -z "$BOOT_PART" ] && BOOT_PART=$(df "$BOOT_ROOT" | tail -1 | awk {' print $1 '})
# identify the boot device # identify the boot device
if [ -z "$BOOT_DISK" ]; then if [ -z "$BOOT_DISK" ]; then
case $BOOT_PART in case $BOOT_PART in
/dev/sd[a-z][0-9]*) /dev/sd[a-z][0-9]*)
BOOT_DISK=$(echo $BOOT_PART | sed -e "s,[0-9]*,,g") BOOT_DISK=$(echo $BOOT_PART | sed -e "s,[0-9]*,,g")
;; ;;
/dev/mmcblk*) /dev/mmcblk*)
BOOT_DISK=$(echo $BOOT_PART | sed -e "s,p[0-9]*,,g") BOOT_DISK=$(echo $BOOT_PART | sed -e "s,p[0-9]*,,g")
;; ;;
esac esac
fi fi
# mount $BOOT_ROOT rw # mount $BOOT_ROOT rw
mount -o remount,rw $BOOT_ROOT mount -o remount,rw $BOOT_ROOT
# update /amlogic device trees # update /amlogic device trees
if [ -d $BOOT_ROOT/amlogic ]; then if [ -d $BOOT_ROOT/amlogic ]; then
for dtbfile in $BOOT_ROOT/amlogic/*.dtb ; do for dtbfile in $BOOT_ROOT/amlogic/*.dtb; do
dtb=$(basename $dtbfile) dtb=$(basename $dtbfile)
if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
echo "Updating $dtb" echo "Updating $dtb"
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/amlogic/ 2>/dev/null || true cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/amlogic/
done fi
fi done
fi
# update /extlinux device trees # update /extlinux device trees
if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then
for dtbfile in $BOOT_ROOT/*.dtb ; do for dtbfile in $BOOT_ROOT/*.dtb; do
dtb=$(basename $dtbfile) dtb=$(basename $dtbfile)
if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
echo "Updating $dtb" echo "Updating $dtb"
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/
done fi
fi done
fi
# update /dtb device trees # update /dtb device trees
if [ -d $BOOT_ROOT/dtb ]; then if [ -d $BOOT_ROOT/dtb ]; then
for dtbfile in $BOOT_ROOT/dtb/*.dtb ; do for dtbfile in $BOOT_ROOT/dtb/*.dtb; do
dtb=$(basename $dtbfile) dtb=$(basename $dtbfile)
if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
echo "Updating $dtb" echo "Updating $dtb"
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/dtb/ 2>/dev/null || true cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/dtb/
done fi
fi done
fi
# update u-boot scripts # update u-boot scripts
if [ -f $BOOT_ROOT/uEnv.ini ]; then if [ -f $BOOT_ROOT/uEnv.ini ]; then
for scriptfile in $SYSTEM_ROOT/usr/share/bootloader/*_autoscript* $SYSTEM_ROOT/usr/share/bootloader/*.scr ; do for scriptfile in $SYSTEM_ROOT/usr/share/bootloader/*_autoscript* $SYSTEM_ROOT/usr/share/bootloader/*.scr; do
script=$(basename $scriptfile) script=$(basename $scriptfile)
if [ -f $SYSTEM_ROOT/usr/share/bootloader/$script ]; then
echo "Updating $script" echo "Updating $script"
cp -p $SYSTEM_ROOT/usr/share/bootloader/$script $BOOT_ROOT/ 2>/dev/null || true cp -p $SYSTEM_ROOT/usr/share/bootloader/$script $BOOT_ROOT/
done fi
fi done
fi
# mount $BOOT_ROOT ro # mount $BOOT_ROOT ro
sync sync
mount -o remount,ro $BOOT_ROOT mount -o remount,ro $BOOT_ROOT

View File

@ -27,8 +27,5 @@
# KODI Player implementation to use # KODI Player implementation to use
KODIPLAYER_DRIVER="$OPENGLES" KODIPLAYER_DRIVER="$OPENGLES"
# Mali GPU family
MALI_FAMILY="450 t820 g31 g52"
# Set the addon project # Set the addon project
ADDON_PROJECT="ARMv8" ADDON_PROJECT="ARMv8"

View File

@ -4,7 +4,7 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
case $(dtsoc) in case $(dtsoc) in
amlogic,g12*|amlogic,sm1) amlogic,g12* | amlogic,sm1)
TEMP=$(cat /sys/devices/virtual/thermal/thermal_zone1/temp) TEMP=$(cat /sys/devices/virtual/thermal/thermal_zone1/temp)
;; ;;
*) *)
@ -12,5 +12,5 @@ case $(dtsoc) in
;; ;;
esac esac
TEMP="$(( $TEMP / 1000 ))" TEMP="$(($TEMP / 1000))"
echo "${TEMP} C" echo "${TEMP} C"

View File

@ -7400,9 +7400,20 @@ CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_TIME_NS=y CONFIG_GENERIC_VDSO_TIME_NS=y
CONFIG_FONT_SUPPORT=y CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set CONFIG_FONTS=y
CONFIG_FONT_8x8=y CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y CONFIG_FONT_8x16=y
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_6x10 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_STACKWALK=y
CONFIG_STACKDEPOT=y CONFIG_STACKDEPOT=y

View File

@ -67,7 +67,7 @@
ADDITIONAL_DRIVERS+="" ADDITIONAL_DRIVERS+=""
# additional packages to install: # additional packages to install:
ADDITIONAL_PACKAGES+=" dtc ethmactool emmctool flashrom pciutils" ADDITIONAL_PACKAGES+=" dtc ethmactool emmctool flashrom pciutils tm16xx"
# use the kernel CEC framework for libcec (yes / no) # use the kernel CEC framework for libcec (yes / no)
CEC_FRAMEWORK_SUPPORT="yes" CEC_FRAMEWORK_SUPPORT="yes"

View File

@ -8,16 +8,16 @@ SYS_CPUFREQ_GOV=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)
if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then
for io_is_busy in $(find /sys/devices/system/cpu -name io_is_busy); do for io_is_busy in $(find /sys/devices/system/cpu -name io_is_busy); do
echo 1 > "${io_is_busy}" echo 1 >"${io_is_busy}"
done done
for up_threshold in $(find /sys/devices/system/cpu -name up_threshold); do for up_threshold in $(find /sys/devices/system/cpu -name up_threshold); do
echo 50 > "${up_threshold}" echo 50 >"${up_threshold}"
done done
for sampling_rate in $(find /sys/devices/system/cpu -name sampling_rate); do for sampling_rate in $(find /sys/devices/system/cpu -name sampling_rate); do
echo 100000 > "${sampling_rate}" echo 100000 >"${sampling_rate}"
done done
for sampling_down_factor in $(find /sys/devices/system/cpu -name sampling_down_factor); do for sampling_down_factor in $(find /sys/devices/system/cpu -name sampling_down_factor); do
echo 50 > "${sampling_down_factor}" echo 50 >"${sampling_down_factor}"
done done
else else
echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info

View File

@ -2,14 +2,15 @@
FB_TYPE="$(grep '^0 ' /proc/fb | sed 's/[^[:space:]] //')" FB_TYPE="$(grep '^0 ' /proc/fb | sed 's/[^[:space:]] //')"
if [ "$FB_TYPE" == "inteldrmfb" ] || echo "$FB_TYPE" | grep -q "^i9[0-9]*drmfb$"; then if [ "$FB_TYPE" == "inteldrmfb" ] || echo "$FB_TYPE" | grep -q "^i9[0-9]*drmfb$"; then
OUTPUT=`/usr/bin/xrandr -display :0 -q | sed '/ connected/!d;s/ .*//;q'` OUTPUT=$(/usr/bin/xrandr -display :0 -q | sed '/ connected/!d;s/ .*//;q')
for out in $OUTPUT ; do for out in $OUTPUT; do
# Hack - something is not yet fully right # Hack - something is not yet fully right
/usr/bin/xrandr -display :0 --output $out --set "Broadcast RGB" "Full" /usr/bin/xrandr -display :0 --output $out --set "Broadcast RGB" "Full"
# Seems there is a little race somewhere on some outputs # Seems there is a little race somewhere on some outputs
# Turn the display shortly off and on again # Turn the display shortly off and on again
if [ -e "/storage/.config/forcedisplay" ]; then if [ -e "/storage/.config/forcedisplay" ]; then
/usr/bin/xrandr -display :0 --output $out --off ; /usr/bin/xrandr -display :0 --output $out --auto /usr/bin/xrandr -display :0 --output $out --off
/usr/bin/xrandr -display :0 --output $out --auto
fi fi
done done
fi fi

View File

@ -16,16 +16,16 @@ if [ $(basename "$0") = "gputemp" -o "$1" = "gpu" ]; then
for hwmon in /sys/class/hwmon/*; do for hwmon in /sys/class/hwmon/*; do
if [ -f "${hwmon}/name" ]; then if [ -f "${hwmon}/name" ]; then
case $(cat ${hwmon}/name) in case $(cat ${hwmon}/name) in
nouveau|radeon|amdgpu) nouveau | radeon | amdgpu)
[[ -f "${hwmon}/temp1_input" ]] && TEMP="$(cat ${hwmon}/temp1_input)" && break [[ -f "${hwmon}/temp1_input" ]] && TEMP="$(cat ${hwmon}/temp1_input)" && break
[[ -f "${hwmon}/temp2_input" ]] && TEMP="$(cat ${hwmon}/temp2_input)" && break [[ -f "${hwmon}/temp2_input" ]] && TEMP="$(cat ${hwmon}/temp2_input)" && break
;; ;;
# intel gpu is supported by cpu coretemp below # intel gpu is supported by cpu coretemp below
esac esac
fi fi
done done
TEMP="$(( $TEMP / 1000 ))" TEMP="$(($TEMP / 1000))"
fi fi
fi fi
@ -34,7 +34,7 @@ if [ "$1" = "cpu" -o "$TEMP" = "0" ]; then
for hwmon in /sys/class/hwmon/*; do for hwmon in /sys/class/hwmon/*; do
if [ -f "${hwmon}/name" ]; then if [ -f "${hwmon}/name" ]; then
case $(cat ${hwmon}/name) in case $(cat ${hwmon}/name) in
coretemp|k10temp|scpi_sensors) coretemp | k10temp | scpi_sensors)
[[ -f "${hwmon}/temp1_input" ]] && TEMP="$(cat ${hwmon}/temp1_input)" && break [[ -f "${hwmon}/temp1_input" ]] && TEMP="$(cat ${hwmon}/temp1_input)" && break
[[ -f "${hwmon}/temp2_input" ]] && TEMP="$(cat ${hwmon}/temp2_input)" && break [[ -f "${hwmon}/temp2_input" ]] && TEMP="$(cat ${hwmon}/temp2_input)" && break
;; ;;
@ -46,7 +46,7 @@ if [ "$1" = "cpu" -o "$TEMP" = "0" ]; then
TEMP="$(cat /sys/class/hwmon/hwmon0/device/temp1_input)" TEMP="$(cat /sys/class/hwmon/hwmon0/device/temp1_input)"
fi fi
TEMP="$(( $TEMP / 1000 ))" TEMP="$(($TEMP / 1000))"
fi fi
echo "${TEMP} C" echo "${TEMP} C"

View File

@ -7038,9 +7038,20 @@ CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_TIME_NS=y CONFIG_GENERIC_VDSO_TIME_NS=y
CONFIG_FONT_SUPPORT=y CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set CONFIG_FONTS=y
CONFIG_FONT_8x8=y CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y CONFIG_FONT_8x16=y
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_6x10 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y

View File

@ -13,105 +13,104 @@ USED_IFACES=""
function log function log
{ {
logger -t "${LOGGER_TAG}" "$@" logger -t "${LOGGER_TAG}" "$@"
} }
function logerr function logerr
{ {
logger -t "${LOGGER_TAG}" -p "err" "$@" logger -t "${LOGGER_TAG}" -p "err" "$@"
} }
# Select setup based on model # Select setup based on model
case "${MODEL}" in case "${MODEL}" in
"ZII RDU2+ Board" | "ZII RDU2 Board") "ZII RDU2+ Board" | "ZII RDU2 Board")
log "Loading RDU2 networking setup..." log "Loading RDU2 networking setup..."
IP_IFACE="eth1" IP_IFACE="eth1"
BR_NAME="br0" BR_NAME="br0"
BR_IFACES="netaux netleft netright gigabit_proc" BR_IFACES="netaux netleft netright gigabit_proc"
ALL_IFACES="eth0 ${IP_IFACE} ${BR_IFACES} ${BR_NAME}" ALL_IFACES="eth0 ${IP_IFACE} ${BR_IFACES} ${BR_NAME}"
;; ;;
"ZII RDU1 Board") "ZII RDU1 Board")
log "Loading RDU1 networking setup..." log "Loading RDU1 networking setup..."
IP_IFACE="br0" IP_IFACE="br0"
BR_NAME="br0" BR_NAME="br0"
BR_IFACES="netaux netleft netright" BR_IFACES="netaux netleft netright"
ALL_IFACES="eth0 ${BR_NAME} ${BR_IFACES}" ALL_IFACES="eth0 ${BR_NAME} ${BR_IFACES}"
;; ;;
*) *)
logerr "invalid hardware model detected: ${MODEL}" logerr "invalid hardware model detected: ${MODEL}"
exit 1 exit 1
;; ;;
esac esac
case "${ACTION}" in case "${ACTION}" in
"start") "start")
# Assume RDU network is already started if the bridge is available # Assume RDU network is already started if the bridge is available
if [ -d /sys/class/net/${BR_NAME} ]; then if [ -d /sys/class/net/${BR_NAME} ]; then
log "Networking setup is already started" log "Networking setup is already started"
exit 0 exit 0
fi fi
# Cleanup all addresses from all interfaces and bring them down # Cleanup all addresses from all interfaces and bring them down
log "Resetting interfaces..." log "Resetting interfaces..."
for IFACE in ${ALL_IFACES}; do for IFACE in ${ALL_IFACES}; do
log " Resetting ${IFACE}..." log " Resetting ${IFACE}..."
ip addr flush dev ${IFACE} >/dev/null 2>&1 ip addr flush dev ${IFACE} >/dev/null 2>&1
ip link set dev ${IFACE} down >/dev/null 2>&1 ip link set dev ${IFACE} down >/dev/null 2>&1
done done
# Create bridge with all interfaces # Create bridge with all interfaces
log "Creating bridge interface..." log "Creating bridge interface..."
brctl addbr ${BR_NAME} >/dev/null 2>&1 brctl addbr ${BR_NAME} >/dev/null 2>&1
for IFACE in ${BR_IFACES}; do for IFACE in ${BR_IFACES}; do
log " Adding ${IFACE} to bridge..." log " Adding ${IFACE} to bridge..."
brctl addif ${BR_NAME} ${IFACE} >/dev/null 2>&1 brctl addif ${BR_NAME} ${IFACE} >/dev/null 2>&1
done done
# Bring all bridge interfaces and the bridge itself up # Bring all bridge interfaces and the bridge itself up
log "Bringing up all interfaces..." log "Bringing up all interfaces..."
for IFACE in ${ALL_IFACES}; do for IFACE in ${ALL_IFACES}; do
log " Bringing up ${IFACE}..." log " Bringing up ${IFACE}..."
ip link set dev ${IFACE} up >/dev/null 2>&1 ip link set dev ${IFACE} up >/dev/null 2>&1
done done
# All done # All done
log "RDU networking started" log "RDU networking started"
exit 0 exit 0
;; ;;
"stop") "stop")
# Assume RDU network is already stopped if the bridge is available # Assume RDU network is already stopped if the bridge is available
if [ ! -d /sys/class/net/${BR_NAME} ]; then if [ ! -d /sys/class/net/${BR_NAME} ]; then
log "Networking setup is already stopped" log "Networking setup is already stopped"
exit 0 exit 0
fi fi
# Cleanup all addresses from all interfaces and bring them down # Cleanup all addresses from all interfaces and bring them down
log "Resetting interfaces..." log "Resetting interfaces..."
for IFACE in ${ALL_IFACES}; do for IFACE in ${ALL_IFACES}; do
ip addr flush dev ${IFACE} >/dev/null 2>&1 ip addr flush dev ${IFACE} >/dev/null 2>&1
ip link set dev ${IFACE} down >/dev/null 2>&1 ip link set dev ${IFACE} down >/dev/null 2>&1
done done
# Remove bridge interfaces and bridge itself # Remove bridge interfaces and bridge itself
log "Removing bridge interface..." log "Removing bridge interface..."
for IFACE in ${BR_IFACES}; do for IFACE in ${BR_IFACES}; do
brctl delif ${BR_NAME} ${IFACE} >/dev/null 2>&1 brctl delif ${BR_NAME} ${IFACE} >/dev/null 2>&1
done done
brctl delbr ${BR_NAME} >/dev/null 2>&1 brctl delbr ${BR_NAME} >/dev/null 2>&1
# All done # All done
log "RDU networking stopped" log "RDU networking stopped"
exit 0 exit 0
;; ;;
*) *)
logerr "invalid action requested: ${ACTION}" logerr "invalid action requested: ${ACTION}"
exit 2 exit 2
;; ;;
esac esac

View File

@ -7449,7 +7449,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_10x18 is not set # CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_TER16x32 is not set CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set # CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_STACKWALK=y

View File

@ -4,4 +4,4 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -4,4 +4,4 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -6992,9 +6992,20 @@ CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_TIME_NS=y CONFIG_GENERIC_VDSO_TIME_NS=y
CONFIG_FONT_SUPPORT=y CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set CONFIG_FONTS=y
CONFIG_FONT_8x8=y CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y CONFIG_FONT_8x16=y
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_6x10 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_STACKWALK=y
CONFIG_STACKDEPOT=y CONFIG_STACKDEPOT=y

View File

@ -16,17 +16,17 @@ if [ -z "$BOOT_DISK" ]; then
fi fi
# mount $BOOT_ROOT r/w # mount $BOOT_ROOT r/w
mount -o remount,rw $BOOT_ROOT mount -o remount,rw $BOOT_ROOT
# update Device Tree Blobs # update Device Tree Blobs
for all_dtb in /flash/*.dtb; do for all_dtb in /flash/*.dtb; do
dtb=$(basename $all_dtb) dtb=$(basename $all_dtb)
if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
echo "*** updating Device Tree Blob: $dtb ..." echo "*** updating Device Tree Blob: $dtb ..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT
fi fi
done done
# mount $BOOT_ROOT r/o # mount $BOOT_ROOT r/o
sync sync
mount -o remount,ro $BOOT_ROOT mount -o remount,ro $BOOT_ROOT

View File

@ -7335,9 +7335,20 @@ CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_TIME_NS=y CONFIG_GENERIC_VDSO_TIME_NS=y
CONFIG_FONT_SUPPORT=y CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set CONFIG_FONTS=y
CONFIG_FONT_8x8=y CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y CONFIG_FONT_8x16=y
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_6x10 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_STACKWALK=y
CONFIG_STACKDEPOT=y CONFIG_STACKDEPOT=y

View File

@ -5,4 +5,4 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -4,15 +4,15 @@
# Copyright (C) 2009-2015 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2015 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
SYS_CPUFREQ_GOV=$( cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ) SYS_CPUFREQ_GOV=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)
SYS_ONDEMAND_DIR="/sys/devices/system/cpu/cpufreq/ondemand/" SYS_ONDEMAND_DIR="/sys/devices/system/cpu/cpufreq/ondemand/"
# Configure frequency scaling properties # Configure frequency scaling properties
if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then
echo 1 > "${SYS_ONDEMAND_DIR}/io_is_busy" echo 1 >"${SYS_ONDEMAND_DIR}/io_is_busy"
echo 50 > "${SYS_ONDEMAND_DIR}/up_threshold" echo 50 >"${SYS_ONDEMAND_DIR}/up_threshold"
echo 100000 > "${SYS_ONDEMAND_DIR}/sampling_rate" echo 100000 >"${SYS_ONDEMAND_DIR}/sampling_rate"
echo 50 > "${SYS_ONDEMAND_DIR}/sampling_down_factor" echo 50 >"${SYS_ONDEMAND_DIR}/sampling_down_factor"
else else
echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info
fi fi

View File

@ -4,6 +4,10 @@
PKG_RKBIN="$(get_build_dir rkbin)" PKG_RKBIN="$(get_build_dir rkbin)"
PKG_SOC="${DEVICE/RK/rk}" PKG_SOC="${DEVICE/RK/rk}"
if [ "$(uname -m)" != "x86_64" ]; then
QEMU="qemu-x86_64 -L /usr/x86_64-linux-gnu/"
fi
if [ "${ROCKCHIP_LEGACY_BOOT}" = "1" ]; then if [ "${ROCKCHIP_LEGACY_BOOT}" = "1" ]; then
echo "install: building Rockchip legacy boot chain ..." echo "install: building Rockchip legacy boot chain ..."
@ -28,8 +32,8 @@ if [ "${ROCKCHIP_LEGACY_BOOT}" = "1" ]; then
sed -s 's/\x90\x1\x90\x1\x90\x1\x90\x1\x90\x1\x90\x1/\x20\x3\x20\x3\x20\x3\x20\x3\x20\x3\x20\x3/g' -i "${PKG_DDR_BIN}" sed -s 's/\x90\x1\x90\x1\x90\x1\x90\x1\x90\x1\x90\x1/\x20\x3\x20\x3\x20\x3\x20\x3\x20\x3\x20\x3/g' -i "${PKG_DDR_BIN}"
fi fi
${PKG_RKBIN}/tools/mkimage -n "${PKG_SOC}" -T rksd -d "${PKG_DDR_BIN}":"${PKG_MINILOADER}" idbloader.img.rk || exit 1 ${QEMU} ${PKG_RKBIN}/tools/mkimage -n "${PKG_SOC}" -T rksd -d "${PKG_DDR_BIN}":"${PKG_MINILOADER}" idbloader.img.rk || exit 1
${PKG_RKBIN}/tools/loaderimage --pack --uboot u-boot-dtb.bin uboot.img.rk "${PKG_LOAD_ADDR}" || exit 1 ${QEMU} ${PKG_RKBIN}/tools/loaderimage --pack --uboot u-boot-dtb.bin uboot.img.rk "${PKG_LOAD_ADDR}" || exit 1
dd if=idbloader.img.rk of="${UBOOT_FIT_IMAGE}" seek=0 conv=fsync,notrunc > /dev/null 2>&1 || exit 1 dd if=idbloader.img.rk of="${UBOOT_FIT_IMAGE}" seek=0 conv=fsync,notrunc > /dev/null 2>&1 || exit 1
dd if=uboot.img.rk of="${UBOOT_FIT_IMAGE}" seek=16320 conv=fsync,notrunc > /dev/null 2>&1 || exit 1 dd if=uboot.img.rk of="${UBOOT_FIT_IMAGE}" seek=16320 conv=fsync,notrunc > /dev/null 2>&1 || exit 1
@ -41,7 +45,7 @@ if [ "${ROCKCHIP_LEGACY_BOOT}" = "1" ]; then
exit 1 exit 1
fi fi
"${PKG_RKBIN}"/tools/trust_merger --ignore-bl32 --prepath "${PKG_RKBIN}"/ "${PKG_ATF_INI}" || exit 1 ${QEMU} "${PKG_RKBIN}"/tools/trust_merger --ignore-bl32 --prepath "${PKG_RKBIN}"/ "${PKG_ATF_INI}" || exit 1
dd if=trust.img of="${UBOOT_FIT_IMAGE}" seek=24512 conv=fsync,notrunc > /dev/null 2>&1 || exit 1 dd if=trust.img of="${UBOOT_FIT_IMAGE}" seek=24512 conv=fsync,notrunc > /dev/null 2>&1 || exit 1
fi fi
fi fi

View File

@ -51,7 +51,7 @@ fi
cp -p ${SYSTEM_ROOT}/usr/share/bootloader/${dtb} ${BOOT_ROOT} cp -p ${SYSTEM_ROOT}/usr/share/bootloader/${dtb} ${BOOT_ROOT}
echo "done" echo "done"
elif [ "$(grep -c "FDT /${dtb}" ${BOOT_ROOT}/extlinux/extlinux.conf)" -ne 0 ]; then elif [ "$(grep -c "FDT /${dtb}" ${BOOT_ROOT}/extlinux/extlinux.conf)" -ne 0 ]; then
non_existend_dtb="${dtb}" non_existent_dtb="${dtb}"
fi fi
fi fi
done done
@ -68,8 +68,8 @@ fi
mount -o remount,ro ${BOOT_ROOT} mount -o remount,ro ${BOOT_ROOT}
# warning if device tree was not updated # warning if device tree was not updated
if [ -n "${non_existend_dtb}" ]; then if [ -n "${non_existent_dtb}" ]; then
echo "The device tree ${non_existend_dtb} your installation uses does not exist in this update package." echo "The device tree ${non_existent_dtb} your installation uses does not exist in this update package."
echo "The updated system will continue to use the device tree from the previous system and your installation might be broken." echo "The updated system will continue to use the device tree from the previous system and your installation might be broken."
echo "Please check documentation to find out which boards are supported by this package." echo "Please check documentation to find out which boards are supported by this package."
sleep 10 sleep 10

View File

@ -5,4 +5,4 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -5,4 +5,4 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -37,11 +37,11 @@ CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZO=y
CONFIG_HAVE_KERNEL_LZ4=y CONFIG_HAVE_KERNEL_LZ4=y
# CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZO is not set
CONFIG_KERNEL_LZ4=y # CONFIG_KERNEL_LZ4 is not set
CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_INIT=""
CONFIG_DEFAULT_HOSTNAME="@DISTRONAME@" CONFIG_DEFAULT_HOSTNAME="@DISTRONAME@"
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
@ -7016,9 +7016,20 @@ CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_32=y CONFIG_GENERIC_VDSO_32=y
CONFIG_FONT_SUPPORT=y CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set CONFIG_FONTS=y
CONFIG_FONT_8x8=y CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y CONFIG_FONT_8x16=y
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_6x10 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_STACKWALK=y
CONFIG_STACKDEPOT=y CONFIG_STACKDEPOT=y

View File

@ -21,8 +21,7 @@
KERNEL_MAKE_EXTRACMD+=" rockchip/rk3288-tinker.dtb" KERNEL_MAKE_EXTRACMD+=" rockchip/rk3288-tinker.dtb"
KERNEL_MAKE_EXTRACMD+=" rockchip/rk3288-tinker-s.dtb" KERNEL_MAKE_EXTRACMD+=" rockchip/rk3288-tinker-s.dtb"
# Mali GPU family # Graphic drivers to use
MALI_FAMILY="t760"
GRAPHIC_DRIVERS="panfrost" GRAPHIC_DRIVERS="panfrost"
# kernel serial console # kernel serial console

View File

@ -4,9 +4,9 @@ This is a SoC device for RK3328
**Build** **Build**
* `PROJECT=Rockchip DEVICE=RK3328 ARCH=arm UBOOT_SYSTEM=a1 make image` * `PROJECT=Rockchip DEVICE=RK3328 ARCH=aarch64 UBOOT_SYSTEM=a1 make image`
* `PROJECT=Rockchip DEVICE=RK3328 ARCH=arm UBOOT_SYSTEM=roc-cc make image` * `PROJECT=Rockchip DEVICE=RK3328 ARCH=aarch64 UBOOT_SYSTEM=roc-cc make image`
* `PROJECT=Rockchip DEVICE=RK3328 ARCH=arm UBOOT_SYSTEM=rock64 make image` * `PROJECT=Rockchip DEVICE=RK3328 ARCH=aarch64 UBOOT_SYSTEM=rock64 make image`
**How to use on an Android device** **How to use on an Android device**
- Flash image to a sd-card - Flash image to a sd-card

View File

@ -204,8 +204,8 @@ CONFIG_INITRAMFS_ROOT_GID=0
# CONFIG_RD_LZO is not set # CONFIG_RD_LZO is not set
CONFIG_RD_LZ4=y CONFIG_RD_LZ4=y
CONFIG_RD_ZSTD=y CONFIG_RD_ZSTD=y
CONFIG_INITRAMFS_COMPRESSION_LZ4=y # CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set
# CONFIG_INITRAMFS_COMPRESSION_ZSTD is not set CONFIG_INITRAMFS_COMPRESSION_ZSTD=y
# CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_INITRAMFS_COMPRESSION_NONE is not set
# CONFIG_BOOT_CONFIG is not set # CONFIG_BOOT_CONFIG is not set
CONFIG_INITRAMFS_PRESERVE_MTIME=y CONFIG_INITRAMFS_PRESERVE_MTIME=y
@ -6912,9 +6912,20 @@ CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_TIME_NS=y CONFIG_GENERIC_VDSO_TIME_NS=y
CONFIG_FONT_SUPPORT=y CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set CONFIG_FONTS=y
CONFIG_FONT_8x8=y CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y CONFIG_FONT_8x16=y
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_6x10 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_STACKWALK=y
CONFIG_STACKDEPOT=y CONFIG_STACKDEPOT=y

View File

@ -26,8 +26,7 @@
# Kernel target # Kernel target
KERNEL_TARGET="Image" KERNEL_TARGET="Image"
# Mali GPU family # Graphic drivers to use
MALI_FAMILY="450"
GRAPHIC_DRIVERS="lima" GRAPHIC_DRIVERS="lima"
# kernel serial console # kernel serial console

View File

@ -4,16 +4,16 @@ This is a SoC device for RK3399
**Build** **Build**
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=hugsun-x99 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=hugsun-x99 make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=khadas-edge make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=khadas-edge make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=nanopc-t4 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=nanopc-t4 make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=nanopi-m4 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=nanopi-m4 make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=orangepi make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=orangepi make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=rock960 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rock960 make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=rock-pi-4 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rock-pi-4 make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=rock-pi-4-plus make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rock-pi-4-plus make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=rock-pi-n10 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rock-pi-n10 make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=rockpro64 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rockpro64 make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=roc-pc make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=roc-pc make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=roc-pc-plus make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=roc-pc-plus make image`
* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=sapphire make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=sapphire make image`

View File

@ -204,8 +204,8 @@ CONFIG_INITRAMFS_ROOT_GID=0
# CONFIG_RD_LZO is not set # CONFIG_RD_LZO is not set
CONFIG_RD_LZ4=y CONFIG_RD_LZ4=y
CONFIG_RD_ZSTD=y CONFIG_RD_ZSTD=y
CONFIG_INITRAMFS_COMPRESSION_LZ4=y # CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set
# CONFIG_INITRAMFS_COMPRESSION_ZSTD is not set CONFIG_INITRAMFS_COMPRESSION_ZSTD=y
# CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_INITRAMFS_COMPRESSION_NONE is not set
# CONFIG_BOOT_CONFIG is not set # CONFIG_BOOT_CONFIG is not set
CONFIG_INITRAMFS_PRESERVE_MTIME=y CONFIG_INITRAMFS_PRESERVE_MTIME=y
@ -7709,9 +7709,20 @@ CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_TIME_NS=y CONFIG_GENERIC_VDSO_TIME_NS=y
CONFIG_FONT_SUPPORT=y CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set CONFIG_FONTS=y
CONFIG_FONT_8x8=y CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y CONFIG_FONT_8x16=y
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_6x10 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_STACKWALK=y
CONFIG_STACKDEPOT=y CONFIG_STACKDEPOT=y

View File

@ -26,8 +26,7 @@
# Kernel target # Kernel target
KERNEL_TARGET="Image" KERNEL_TARGET="Image"
# Mali GPU family # Graphic drivers to use
MALI_FAMILY="t860"
GRAPHIC_DRIVERS="panfrost" GRAPHIC_DRIVERS="panfrost"
# kernel serial console # kernel serial console

View File

@ -5,4 +5,4 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -13,7 +13,7 @@
KERNEL_MAKE_EXTRACMD="dtbs" KERNEL_MAKE_EXTRACMD="dtbs"
# Additional kernel dependencies # Additional kernel dependencies
KERNEL_EXTRA_DEPENDS_TARGET="lz4:host" KERNEL_EXTRA_DEPENDS_TARGET=""
# Kernel to use. values can be: # Kernel to use. values can be:
# default: default mainline kernel # default: default mainline kernel
@ -36,7 +36,7 @@
# OpenGL(X) implementation to use (no / mesa) # OpenGL(X) implementation to use (no / mesa)
OPENGL="no" OPENGL="no"
# OpenGL-ES implementation to use (no / libmali / mesa) # OpenGL-ES implementation to use (no / mesa)
OPENGLES="${OPENGLES:-mesa}" OPENGLES="${OPENGLES:-mesa}"
# Vulkan implementation to use (vulkan-loader / no) # Vulkan implementation to use (vulkan-loader / no)

View File

@ -8,16 +8,16 @@ SYS_CPUFREQ_GOV=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)
if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then
for io_is_busy in $(find /sys/devices/system/cpu -name io_is_busy); do for io_is_busy in $(find /sys/devices/system/cpu -name io_is_busy); do
echo 1 > "${io_is_busy}" echo 1 >"${io_is_busy}"
done done
for up_threshold in $(find /sys/devices/system/cpu -name up_threshold); do for up_threshold in $(find /sys/devices/system/cpu -name up_threshold); do
echo 50 > "${up_threshold}" echo 50 >"${up_threshold}"
done done
for sampling_rate in $(find /sys/devices/system/cpu -name sampling_rate); do for sampling_rate in $(find /sys/devices/system/cpu -name sampling_rate); do
echo 100000 > "${sampling_rate}" echo 100000 >"${sampling_rate}"
done done
for sampling_down_factor in $(find /sys/devices/system/cpu -name sampling_down_factor); do for sampling_down_factor in $(find /sys/devices/system/cpu -name sampling_down_factor); do
echo 50 > "${sampling_down_factor}" echo 50 >"${sampling_down_factor}"
done done
else else
echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info

View File

@ -8,29 +8,29 @@
[ -z "$BOOT_PART" ] && BOOT_PART=$(df "$BOOT_ROOT" | tail -1 | awk {' print $1 '}) [ -z "$BOOT_PART" ] && BOOT_PART=$(df "$BOOT_ROOT" | tail -1 | awk {' print $1 '})
# identify the boot device # identify the boot device
if [ -z "$BOOT_DISK" ]; then if [ -z "$BOOT_DISK" ]; then
case $BOOT_PART in case $BOOT_PART in
/dev/sd[a-z][0-9]*) /dev/sd[a-z][0-9]*)
BOOT_DISK=$(echo $BOOT_PART | sed -e "s,[0-9]*,,g") BOOT_DISK=$(echo $BOOT_PART | sed -e "s,[0-9]*,,g")
;; ;;
/dev/mmcblk*) /dev/mmcblk*)
BOOT_DISK=$(echo $BOOT_PART | sed -e "s,p[0-9]*,,g") BOOT_DISK=$(echo $BOOT_PART | sed -e "s,p[0-9]*,,g")
;; ;;
esac esac
fi fi
# mount $BOOT_ROOT rw # mount $BOOT_ROOT rw
mount -o remount,rw $BOOT_ROOT mount -o remount,rw $BOOT_ROOT
# update extlinux device trees # update extlinux device trees
if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then
for dtbfile in $BOOT_ROOT/*.dtb ; do for dtbfile in $BOOT_ROOT/*.dtb; do
dtb=$(basename $dtbfile) dtb=$(basename $dtbfile)
echo "Updating $dtb" echo "Updating $dtb"
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true
done done
fi fi
# mount $BOOT_ROOT ro # mount $BOOT_ROOT ro
sync sync
mount -o remount,ro $BOOT_ROOT mount -o remount,ro $BOOT_ROOT

View File

@ -20,6 +20,3 @@
# KODI Player implementation to use # KODI Player implementation to use
KODIPLAYER_DRIVER="$OPENGLES" KODIPLAYER_DRIVER="$OPENGLES"
# Mali GPU family
MALI_FAMILY="t620"

View File

@ -5,5 +5,5 @@
# XU4 has 5x sensors so read them all and report the highest value # XU4 has 5x sensors so read them all and report the highest value
TEMP=$(cat /sys/devices/virtual/thermal/thermal_zone*/temp | sort -n | tail -1) TEMP=$(cat /sys/devices/virtual/thermal/thermal_zone*/temp | sort -n | tail -1)
TEMP="$(( $TEMP / 1000 ))" TEMP="$(($TEMP / 1000))"
echo "${TEMP} C" echo "${TEMP} C"

View File

@ -37,11 +37,11 @@ CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZO=y
CONFIG_HAVE_KERNEL_LZ4=y CONFIG_HAVE_KERNEL_LZ4=y
# CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZO is not set
CONFIG_KERNEL_LZ4=y # CONFIG_KERNEL_LZ4 is not set
CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_INIT=""
CONFIG_DEFAULT_HOSTNAME="@DISTRONAME@" CONFIG_DEFAULT_HOSTNAME="@DISTRONAME@"
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
@ -6384,7 +6384,7 @@ CONFIG_FONT_7x14=y
# CONFIG_FONT_10x18 is not set # CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_TER16x32 is not set CONFIG_FONT_TER16x32=y
# CONFIG_FONT_6x8 is not set # CONFIG_FONT_6x8 is not set
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_STACKWALK=y

View File

@ -12,7 +12,7 @@
KERNEL_TARGET="zImage" KERNEL_TARGET="zImage"
# Additional kernel dependencies # Additional kernel dependencies
KERNEL_EXTRA_DEPENDS_TARGET="lz4:host" KERNEL_EXTRA_DEPENDS_TARGET=""
# Additional kernel make parameters (for example to specify the u-boot loadaddress) # Additional kernel make parameters (for example to specify the u-boot loadaddress)
KERNEL_MAKE_EXTRACMD="dtbs" KERNEL_MAKE_EXTRACMD="dtbs"

View File

@ -288,7 +288,7 @@ if [ "${#need_map[@]}" -gt 0 ]; then
fi fi
fi fi
# check if installed packages satisifed deps # check if installed packages satisfied deps
get_deps get_deps
if [ "${#need_map[@]}" -gt 0 ]; then if [ "${#need_map[@]}" -gt 0 ]; then

View File

@ -15,7 +15,7 @@ DESCRIPTION
create_addon builds one or more addons. create_addon builds one or more addons.
--show-only --show-only
output the list of packages, which are intented to build output the list of packages, which are intended to build
--help shows this message --help shows this message
@ -70,7 +70,7 @@ get_addons() {
validpkg="no" validpkg="no"
VERIFY_FAIL= VERIFY_FAIL=
# Should only build embedded addons when they are explictly specified in the addon list # Should only build embedded addons when they are explicitly specified in the addon list
if [ "${PKG_IS_ADDON}" = "embedded" ]; then if [ "${PKG_IS_ADDON}" = "embedded" ]; then
if [ -n "${filter}" ]; then if [ -n "${filter}" ]; then
verify_addon && validpkg="yes" verify_addon && validpkg="yes"

View File

@ -93,7 +93,7 @@ case "${ARCH}" in
projects="Generic" projects="Generic"
;; ;;
*) *)
echo "Unkown project" echo "Unknown project"
exit 1 exit 1
;; ;;
esac esac

Some files were not shown because too many files have changed in this diff Show More