Merge pull request #2438 from fewtarius/mainline-3566

Rebase and merge from dev
This commit is contained in:
fewtarius 2023-11-28 04:58:22 -05:00 committed by GitHub
commit 6464fd6964
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
67 changed files with 603 additions and 390 deletions

View file

@ -50,7 +50,7 @@
# a BSP kernel and a rotated display when using DEVICE_ROOT.
if [ -n "${DEVICE_ROOT}" ]
then
CLEAN_DEVICE_ROOT="linux busybox systemd u-boot SDL2 SDL2-rotated retroarch mupen64plus-sa-input-sdl flycast-sa duckstation-sa drastic-sa fileman oga_controls portmaster"
CLEAN_DEVICE_ROOT="busybox systemd initramfs linux u-boot SDL2 SDL2-rotated retroarch mupen64plus-sa-input-sdl flycast-sa duckstation-sa drastic-sa fileman oga_controls portmaster"
fi
# additional drivers to install:

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="beetle-pce-lr"
PKG_VERSION="d61e6e5740aeeb56427802d8d52b912c1a6422b6"
PKG_VERSION="903c58ec2f14f50c8c07e001469121eb513dce61"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="core-info"
PKG_VERSION="2aa595b476569472290c4ff78bbfbd630528ae62"
PKG_VERSION="20401b3ce4b8b3e321e502bc34e4874c95ba6229"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/libretro/libretro-core-info"
PKG_URL="https://github.com/libretro/libretro-core-info/archive/${PKG_VERSION}.tar.gz"

View file

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dosbox-pure-lr"
PKG_VERSION="59bc242dc141e9d220a675c24e2cd31361f22680"
PKG_VERSION="a34cfe9b3ad98fd8c7cb8d11a556b9e98525c5b9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -4,7 +4,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="fbneo-lr"
PKG_VERSION="089013116d33f212b8dd49c007ac56afe3013f27"
PKG_VERSION="6522cbbd39d2999bf916cf9bf5ddea0fc6752b4d"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Non-commercial"

View file

@ -21,7 +21,7 @@
################################################################################
PKG_NAME="genesis-plus-gx-lr"
PKG_VERSION="92f8a8bfaeaf6cf0373e7a84a62a9b9e7c24fe4d"
PKG_VERSION="5745c8a4d0c2db2597ab6c403791888967dd249a"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Non-commercial"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="libretro-database"
PKG_VERSION="ebc9c3f715e78be1d44628468648ff8709aaa743"
PKG_VERSION="77d8296123e5c06b4db660afe557bfa772aacfab"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2019 Trond Haugland (trondah@gmail.com)
PKG_NAME="mame-lr"
PKG_VERSION="4cd28066d8f9e129b1915a72163a10dac84a8731"
PKG_VERSION="0ef9aa356162ce6b51232aecbe309af2e7fbe167"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/mame"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="mupen64plus-nx-lr"
PKG_VERSION="26fd1edd640ff3db49dd5ebb7e54f0de6600fc45"
PKG_VERSION="f1ad37c3a9be64b499d9a36f57e41d59fb677c73"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/mupen64plus-libretro-nx"
PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="tic80-lr"
PKG_VERSION="5061bb221fb8cd2e116efbe14295d7e3af198118"
PKG_VERSION="4b1ec3a52ff3e632e93aeb0f511721d2070ef67f"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/nesbox/TIC-80"
PKG_URL="${PKG_SITE}.git"

View file

@ -21,7 +21,7 @@
################################################################################
PKG_NAME="vice-lr"
PKG_VERSION="29759d81dbe1086215a205d644a60c92905c4fb3"
PKG_VERSION="a2385eb1103a9f5c86333bae0f308ca678fc7d82"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -3,7 +3,7 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
PKG_NAME="flycast-sa"
PKG_VERSION="78a874d20ef5ff5e655713ee3e27e2f94e726621"
PKG_VERSION="ea83b08f89d75e45b11a8c7f5d8607c6a7270e86"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/flyinghead/flycast"
PKG_URL="${PKG_SITE}.git"

View file

@ -7,7 +7,7 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_SITE="https://github.com/hrydgard/ppsspp"
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="3d508ef282d25cfba66a0f3a7e9c45b62b3c637f"
PKG_VERSION="d6324d10a648555e9aad9ea2972ca9ccfd41ef69"
PKG_LICENSE="GPLv2"
PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
PKG_SHORTDESC="PPSSPPDL"

View file

@ -3,7 +3,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="retroarch"
PKG_VERSION="598a0c0d3789450b612170257fe5d58855b48756"
PKG_VERSION="f091b5a9e9475255e5efaded5f95c9750fdfe15e"
PKG_SITE="https://github.com/libretro/RetroArch"
PKG_URL="${PKG_SITE}.git"
PKG_LICENSE="GPLv3"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="gamecontrollerdb"
PKG_VERSION="721b575d3053b21d6d30419bf74afb5b1d0fa7a4"
PKG_VERSION="d4ab609121ee6e687bc3d3a7e80244b3b26d1164"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_DEPENDS_TARGET="toolchain SDL2"

View file

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="retroarch-assets"
PKG_VERSION="262cb6e9bbb92d856f9d88c39aaf3aa03bb9a517"
PKG_VERSION="b98616483faa58be348626393f0ef1bdd74ca51e"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/libretro/retroarch-assets"
PKG_URL="https://github.com/libretro/retroarch-assets/archive/${PKG_VERSION}.tar.gz"

View file

@ -13,5 +13,5 @@ DEVICE_VOLUME="100"
DEVICE_BATTERY_LED_STATUS="true"
DEVICE_PWR_LED_GPIO="77"
DEVICE_TEMP_SENSOR="/sys/devices/virtual/thermal/thermal_zone0/temp"
DEVICE_MMC_EJECT="false"
EOF

View file

@ -10,4 +10,5 @@ DEVICE_SW_HP_SWITCH="true"
DEVICE_PLAYBACK_PATH_SPK="SPK"
DEVICE_PLAYBACK_PATH_HP="HP"
DEVICE_BRIGHTNESS="128"
DEVICE_MMC_EJECT="false"
EOF

View file

@ -14,5 +14,5 @@ DEVICE_VOLUME="100"
DEVICE_BATTERY_LED_STATUS="true"
DEVICE_PWR_LED_GPIO="77"
DEVICE_TEMP_SENSOR="/sys/devices/virtual/thermal/thermal_zone0/temp"
DEVICE_MMC_EJECT="false"
EOF

View file

@ -9,4 +9,5 @@ DEVICE_POWER_LED="false"
DEVICE_PLAYBACK_PATH_SPK="SPK"
DEVICE_PLAYBACK_PATH_HP="HP"
DEVICE_BRIGHTNESS="128"
DEVICE_MMC_EJECT="false"
EOF

View file

@ -1 +0,0 @@
ayn Loki Zero

View file

@ -0,0 +1,8 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
cat <<EOF >/storage/.config/profile.d/010-led_control
DEVICE_LED_CONTROL="true"
DEVICE_LED_BRIGHTNESS="true"
EOF

View file

@ -0,0 +1,11 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
. /etc/profile.d/001-functions
AUDIO_LATENCY=$(get_setting audiolatency)
if [ -z "${AUDIO_LATENCY}" ]
then
set_setting global.audiolatency 64
fi

View file

@ -0,0 +1,11 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
cat <<EOF >/storage/.config/profile.d/020-fan_control
DEVICE_HAS_FAN="true"
DEVICE_PWM_FAN="$(find /sys/devices/platform/ayn-platform -name pwm1)"
DEVICE_FAN_INPUT="$(find /sys/devices/platform/ayn-platform -name fan*_input)"
DEVICE_TEMP_SENSOR="$(find /sys/devices/pci*/* -path "*/nvme" -prune -o -name temp1_input -print)"
EOF

View file

@ -0,0 +1,8 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
cat <<EOF >/storage/.config/profile.d/050-modifiers
DEVICE_FUNC_KEYA_MODIFIER="BTN_MODE"
DEVICE_FUNC_KEYB_MODIFIER="KEY_LEFTSHIFT"
EOF

View file

@ -0,0 +1,78 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
. /etc/profile
DEBUG=false
COOLING_PROFILE=$(get_setting "cooling.profile")
log $0 "Setting profile to ${COOLING_PROFILE}"
function set_control() {
log $0 "Set fan control to ${1}"
ectool -w 0x10 -z ${1} >/dev/null 2>&1
}
trap "set_control 0x01 && exit 0" SIGHUP SIGINT SIGQUIT SIGABRT
if [ -e "/storage/.config/fancontrol.conf" ] && [ "${COOLING_PROFILE}" = "custom" ]
then
log $0 "Loading configuration file" 2>/dev/null
source /storage/.config/fancontrol.conf
if [ ! $? = 0 ]
then
WARN="Custom fan profile could not be loaded, defaulting to auto."
log $0 "${WARN}"
COOLING_PROFILE="auto"
set_setting cooling.profile auto
fi
fi
if [ ! "${COOLING_PROFILE}" = "custom" ]
then
if [ "${COOLING_PROFILE}" = "aggressive" ]
then
SPEEDS=(128 96 72)
TEMPS=(70000 65000 0)
elif [ "${COOLING_PROFILE}" = "moderate" ]
then
SPEEDS=(128 96 72 64 48)
TEMPS=(70000 65000 60000 55000 0)
elif [ "${COOLING_PROFILE}" = "quiet" ]
then
SPEEDS=(128 96 64 48 32)
TEMPS=(70000 65000 60000 55000 0)
else
# auto
set_control 0x01 >/dev/null 2>&1
exit 0
fi
fi
log $0 "Enabling fan control."
set_control 0x00 >/dev/null 2>&1
while true
do
INDEX=0
CPU_TEMP=$(printf "%.0f" $(awk '{ total += $1; count++ } END { print total/count }' ${DEVICE_TEMP_SENSOR}))
$DEBUG && log $0 "CPU TEMP: ${CPU_TEMP}" 2>/dev/null
for TEMP in "${TEMPS[@]}"
do
if (( "${CPU_TEMP}" > "${TEMP}" )) && \
[ ! "${LASTSPEED}" = "${SPEEDS[${INDEX}]}" ]
then
$DEBUG && log $0 "Setting PWM FAN to ${SPEEDS[${INDEX}]} (${TEMP})" 2>/dev/null
ectool -w 0x11 -z $(printf '%x\n' ${SPEEDS[${INDEX}]}) >/dev/null 2>&1
LASTSPEED=${SPEEDS[${INDEX}]}
break
fi
INDEX=$(( $INDEX + 1 ))
done
sleep 2
done
log $0 "Disabling fan control."
set_control 0x01 >/dev/null 2>&1

View file

@ -0,0 +1,173 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
#
# A simple tool to manipulate the controller LEDs using ectool, thanks to
# Ayn for the sample code.
#
# Schema:
#
# 0xB3 - RGB Mode
# 0xAA - Save
#
# 0xB0 - Red
# 0xB1 - Green
# 0xB2 - Blue
#
. /etc/profile
RGB_RED="0xB0"
RGB_GREEN="0xB1"
RGB_BLUE="0xB2"
RGB_MODE="0xB3"
RGB_SAVE="0xAA"
RGB_IDLE="0x55"
ECTOOL="/usr/sbin/ectool"
DEBUG=false
function debug_out() {
$DEBUG && echo "ledcontrol: $*"
}
function ec_save() {
TIMEOUT=0
while true
do
STATE="0x$(${ECTOOL} -r ${RGB_MODE})"
if [ "${STATE^^}" == "${RGB_SAVE}" ] || \
[ "${STATE}" == "${RGB_IDLE}" ] || \
[ "${TIMEOUT}" == 5 ]
then
break
fi
sleep .5
TIMEOUT=$(( TIMEOUT + 1 ))
done
${ECTOOL} -w ${RGB_MODE} -z ${RGB_SAVE} >/dev/null 2>&1
}
function ec_set() {
debug_out "Set EC ${1} ${2}"
${ECTOOL} -w ${1} -z ${2} >/dev/null 2>&1
}
function off() {
ec_save
ec_set ${RGB_RED} 0x00
ec_set ${RGB_GREEN} 0x00
ec_set ${RGB_BLUE} 0x00
ec_save
}
function intensity() {
printf "0x%X\n" $((${1} / ${2}))
}
GETBRIGHTNESS=$(get_setting led.brightness)
if [ ! -z "${2}" ]
then
LEDBRIGHTNESS=${2}
debug_out "Arg[2]: ${2}"
elif [ ! -z "${GETBRIGHTNESS}" ]
then
LEDBRIGHTNESS=${GETBRIGHTNESS}
debug_out "GETBRIGHTESS: ${GETBRIGHTNESS}"
else
debug_out "NO SETTING: max"
LEDBRIGHTNESS=mid
set_setting led.brightness max
fi
case ${LEDBRIGHTNESS} in
max)
LEDBRIGHTNESS=1
set_setting led.brightness max
;;
mid)
LEDBRIGHTNESS=2
set_setting led.brightness mid
;;
min)
LEDBRIGHTNESS=4
set_setting led.brightness min
;;
esac
case $1 in
red)
off
COLOR=$(intensity 0xFF ${LEDBRIGHTNESS})
ec_set ${RGB_RED} ${COLOR}
ec_set ${RGB_GREEN} 0x00
ec_set ${RGB_BLUE} 0x00
ec_save
set_setting led.color red
;;
green)
off
COLOR=$(intensity 0xFF ${LEDBRIGHTNESS})
ec_set ${RGB_RED} 0x00
ec_set ${RGB_GREEN} ${COLOR}
ec_set ${RGB_BLUE} 0x00
ec_save
set_setting led.color green
;;
blue)
off
COLOR=$(intensity 0xFF ${LEDBRIGHTNESS})
ec_set ${RGB_RED} 0x00
ec_set ${RGB_GREEN} 0x00
ec_set ${RGB_BLUE} ${COLOR}
ec_save
set_setting led.color blue
;;
teal)
off
COLOR=$(intensity 0x80 ${LEDBRIGHTNESS})
ec_set ${RGB_RED} 0x00
ec_set ${RGB_GREEN} ${COLOR}
ec_set ${RGB_BLUE} ${COLOR}
ec_save
set_setting led.color teal
;;
purple)
off
COLOR=$(intensity 0x80 ${LEDBRIGHTNESS})
ec_set ${RGB_RED} ${COLOR}
ec_set ${RGB_GREEN} 0x00
ec_set ${RGB_BLUE} ${COLOR}
ec_save
set_setting led.color purple
;;
white)
off
COLOR=$(intensity 0x80 ${LEDBRIGHTNESS})
ec_set ${RGB_RED} ${COLOR}
ec_set ${RGB_GREEN} ${COLOR}
ec_set ${RGB_BLUE} ${COLOR}
ec_save
set_setting led.color purple
;;
off)
off
set_setting led.color off
;;
default)
del_setting led.color
ec_set ${RGB_MODE} 0x00
;;
brightness)
set_setting led.brightness ${2}
ledcontrol $(get_setting led.color)
;;
*)
COLOR=$(get_setting led.color)
if [ ! -z "${COLOR}" ]
then
ledcontrol ${COLOR}
fi
;;
esac

View file

@ -1 +1 @@
ayn Loki Zero
ayn Loki Max

View file

@ -0,0 +1,15 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
. /etc/profile.d/001-functions
### Set the default device configuration
cat <<EOF >/storage/.config/profile.d/001-device_config
DEVICE_BASE_TDP="6w"
DEVICE_LED_CONTROL="false"
DEVICE_LED_BRIGHTNESS="false"
DEVICE_HAS_FAN="false"
DEVICE_VOLUMECTL="true"
DEVICE_BRIGHTNESS="hardware"
EOF

View file

@ -26,6 +26,7 @@ export SLOW_CORES \
DEVICE_KEY_VOLUMEUP \
DEVICE_LED_BRIGHTNESS \
DEVICE_LED_CONTROL \
DEVICE_MMC_EJECT \
DEVICE_PIPEWIRE_PROFILE \
DEVICE_PWR_LED_CONTROL \
DEVICE_PWR_LED_GPIO \

View file

@ -25,42 +25,9 @@ fi
### to last known good state if corrupt.
/usr/bin/chksysconfig verify
### Clean up settings
sort_settings
### We do not want to mount the cloud drive on startup
### so we'll reset the mount option to 0.
set_setting clouddrive.mounted 0
### Enable the desired number of threads.
tocon "Restoring cpu threads..."
NUMTHREADS=$(get_setting "system.threads")
if [ -n "${NUMTHREADS}" ]
then
onlinethreads ${NUMTHREADS} 0
else
onlinethreads all 1
fi
### If we don't have a default governor set, set it
### to schedutil.
if [ -z "$(get_setting system.cpugovernor)" ]
then
set_setting system.cpugovernor schedutil
fi
### Set the default GPU performance mode
GPUPERF=$(get_setting system.gpuperf)
if [ -n "${GPUPERF}" ]
then
gpu_performance_level ${GPUPERF}
fi
### Configure suspend mode.
MYSLEEPMODE=$(get_setting system.suspendmode)
if [ -n "${MYSLEEPMODE}" ]
then
/usr/bin/suspendmode ${MYSLEEPMODE}
else
/usr/bin/suspendmode mem
fi
### Clean up settings
sort_settings

View file

@ -0,0 +1,33 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
# Minimal OS variable loading for performance
. /etc/profile.d/001-functions
. /etc/profile.d/099-freqfunctions
tocon "Setting performance mode..."
### Enable the desired number of threads.
tocon "Restoring cpu threads..."
NUMTHREADS=$(get_setting "system.threads")
if [ -n "${NUMTHREADS}" ]
then
onlinethreads ${NUMTHREADS} 0
else
onlinethreads all 1
fi
### If we don't have a default governor set, set it
### to schedutil but don't enable it.
if [ -z "$(get_setting system.cpugovernor)" ]
then
set_setting system.cpugovernor schedutil
fi
### Set the default GPU performance mode
GPUPERF=$(get_setting system.gpuperf)
if [ -n "${GPUPERF}" ]
then
gpu_performance_level ${GPUPERF}
fi

View file

@ -0,0 +1,17 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
# Minimal OS variable loading for performance
. /etc/profile.d/001-functions
tocon "Configure suspend mode..."
### Configure suspend mode.
MYSLEEPMODE=$(get_setting system.suspendmode)
if [ -n "${MYSLEEPMODE}" ]
then
/usr/bin/suspendmode ${MYSLEEPMODE}
else
/usr/bin/suspendmode mem
fi

View file

@ -73,6 +73,26 @@ sed -i 's~"pulse"~"alsathread"~g' /storage/.config/retroarch/retroarch.cfg
### 20231114 - Update hosts.conf
grep "127.0.0.1" /storage/.config/hosts.conf >/dev/null 2>&1 || cp /usr/config/hosts.conf /storage/.config/
### 20231127 - Migrate games to overlayfs
systemctl stop storage-roms.mount
GAMECOUNT=$(find /storage/roms -type f | wc -l)
if [ "${GAMECOUNT}" -gt 20 ] && \
[ ! -e "/storage/.migrated_games" ]
then
echo "Migrating games to overlayfs" >>${LOG}
if [ -d "/storage/games-internal" ]
then
echo "Backing up games-internal" >>${LOG}
mv /storage/games-internal /storage/games-internal.backup
fi
mv /storage/roms /storage/games-internal
mkdir /storage/roms
touch /storage/.migrated_games
else
echo "Game weight too low (${GAMECOUNT}) or content already migrated." >>${LOG}
fi
systemctl start storage-roms.mount
### Items below this line should not be removed.
tocon "Update complete, rebooting..."
reboot

View file

@ -8,12 +8,16 @@
UPDATE_ROOT="/storage/.update"
MOUNT_GAMES=$(get_setting system.automount)
GAMES_DEVICE=$(get_setting system.gamesdevice)
MOUNT_PATH="/storage/games-external"
OVERLAY_PATH="/storage/roms"
if [[ ! "${MOUNT_GAMES}" =~ [0-9] ]]
then
set_setting system.automount 1
elif [[ "${MOUNT_GAMES}" == "0" ]]
then
systemctl enable storage-roms.mount >/dev/null 2>&1
systemctl start storage-roms.mount >/dev/null 2>&1
exit 0
fi
@ -29,27 +33,55 @@ load_modules() {
}
mount_games() {
FSTYPE=$(blkid -o export ${1} | awk 'BEGIN {FS="="} /TYPE/ {print $2}')
case ${FSTYPE} in
ext4)
ENABLE_OVERLAY=true
if [ -e "/storage/.overlay_unsupported" ]
then
rm -f /storage/.overlay_unsupported
fi
touch /storage/.overlay_supported
set_setting system.merged.storage 1
;;
*)
systemctl stop storage-roms.mount >/dev/null 2>&1
systemctl disable storage-roms.mount >/dev/null 2>&1
MOUNT_PATH=${OVERLAY_PATH}
if [ -e "/storage/.overlay_supported" ]
then
rm -f /storage/.overlay_supported
fi
touch /storage/.overlay_unsupported
;;
esac
if [ ! -d "${MOUNT_PATH}" ]
then
/usr/bin/busybox mkdir -p ${MOUNT_PATH} >/dev/null 2>&1
fi
NULL=$(cat /proc/mounts | grep -v -e "/var/media" 2>/dev/null | grep ${1})
if [ ! "$?" = "0" ] && \
[ -e "${1}" ] && \
[ ! -e "/storage/.please_resize_me" ]
then
### Udevil shouldn't mount it this early, but just in-case.
umount /var/media/*
umount /var/media/* 2>/dev/null
log $0 "FSCK ${1}"
fsck -Mly ${1}
log $0 "Mounting ${1} on /storage/roms"
/usr/bin/busybox mount ${1} /storage/roms >/dev/null 2>&1
/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/JELOS-system-dirs.conf >/dev/null 2>&1
log $0 "Mounting ${1} on ${MOUNT_PATH}"
/usr/bin/busybox mount ${1} ${MOUNT_PATH} >/dev/null 2>&1
if [ "${ENABLE_OVERLAY}" = true ]
then
systemctl enable storage-roms.mount >/dev/null 2>&1
systemctl restart storage-roms.mount >/dev/null 2>&1
fi
fi
}
find_games() {
if /usr/bin/busybox mountpoint -q /storage ; then
if [ ! -d "/storage/roms" ]
then
/usr/bin/busybox mkdir -p /storage/roms >/dev/null 2>&1
fi
for DEV in $(for dev in mmcblk[0-9] sd[a-z] nvme[0-9]; do blkid | grep ${dev} | awk 'BEGIN {FS=":"}; /ext4/ || /fat/ {print $1}' | sort -r; done)
do

View file

@ -1,76 +0,0 @@
#!/bin/bash
# rom_system_split: split your roms across your local and external storage
# prerequesites:
# - local roms must be stored in "/storage/roms_local"
# - external roms must be stored in "/storage/roms"
# - you cannot spread the same system files across multiple locations
# NOTE: if duplicate systems are found, local folders will take preference
LOCAL_FOLDER_NAME="roms_local"
EXT_FOLDER_NAME="roms"
LOCAL_ROM_FOLDERS=$(
ls -d ${LOCAL_FOLDER_NAME}/*/ |
sed -e "s/${LOCAL_FOLDER_NAME}//g"
)
EXT_ROM_FOLDERS=$(
ls -d ${EXT_FOLDER_NAME}/*/ |
sed -e "s/${EXT_FOLDER_NAME}//g"
)
ES_SYSTEMS="/storage/.emulationstation/es_systems.cfg"
ES_LIST=$(
cat ${ES_SYSTEMS} |
grep "<path>" |
sed -e "s/<path>//g" -e "s/<\/path>//g" -e "s/\/storage\///g"
)
echo "LOCAL_FOLDER_NAME: ${LOCAL_FOLDER_NAME}"
echo "EXT_FOLDER_NAME: ${EXT_FOLDER_NAME}"
echo "EXT_STORAGE: ${EXT_STORAGE}"
echo "EXTERNAL: ${EXTERNAL}"
echo "LOCAL_ROM_FOLDERS: $LOCAL_ROM_FOLDERS{}"
echo "EXT_ROM_FOLDERS: ${EXT_ROM_FOLDERS}"
echo "ES_SYSTEMS: ${ES_SYSTEMS}"
echo "ES_LIST: ${ES_LIST}"
# required paramaters: local/external, rom folder list, es folder list
update_es_folders() {
folder_name=${LOCAL_FOLDER_NAME}
orig_folder_name=${EXT_FOLDER_NAME}
if [[ $1 == "external" ]]
then
folder_name=${EXT_FOLDER_NAME}
orig_folder_name=${LOCAL_FOLDER_NAME}
fi
folder_array=( $2 )
for folder in ${folder_array[@]}
do
system=${folder%?}
# check that the system exists in ES
if [[ $3 == *"${system}"* ]]
then
# skip if there are no files in the folder
if [ -z "$(ls -A /storage/${folder_name}${system})" ]
then
continue
fi
# if the folder doesn't exist in ES, update the original
if [[ $3 != *"${folder_name}${system}"* ]]
then
sed -i -e "s|<path>/storage/${orig_folder_name}${system}</path>|<path>/storage/${folder_name}${system}</path>|g" ${ES_SYSTEMS}
fi
fi
done
}
# check the external folders first
update_es_folders "external" "${EXT_ROM_FOLDERS}" "${ES_LIST}"
# next check the local folders
# if there are duplicate folders in EXTERNAL, LOCAL ones will take preference
update_es_folders "local" "${LOCAL_ROM_FOLDERS}" "${ES_LIST}"

View file

@ -123,7 +123,7 @@ fi
### We need the original system cooling profile later so get it now!
COOLINGPROFILE=$(get_setting cooling.profile)
### Set CPU TDP (AMD) or EPP (Intel)
### Set CPU TDP and EPP
CPU_VENDOR=$(cpu_vendor)
case ${CPU_VENDOR} in
AuthenticAMD)
@ -134,15 +134,14 @@ case ${CPU_VENDOR} in
/usr/bin/overclock ${OVERCLOCK}
fi
;;
GenuineIntel)
EPP=$(get_setting "power.epp" "${PLATFORM}" "${ROMNAME##*/}")
if [ ! -z ${EPP} ]
then
/usr/bin/set_epp ${EPP}
fi
;;
esac
EPP=$(get_setting "power.epp" "${PLATFORM}" "${ROMNAME##*/}")
if [ ! -z ${EPP} ]
then
/usr/bin/set_epp ${EPP}
fi
GPUPERF=$(get_setting "gpuperf" "${PLATFORM}" "${ROMNAME##*/}")
if [ ! -z ${GPUPERF} ]
then

View file

@ -55,8 +55,14 @@
browseable = yes
writeable = yes
[roms]
path = /storage/roms
[games-internal]
path = /storage/games-internal
available = yes
browseable = yes
writeable = yes
[games-external]
path = /storage/games-external
available = yes
browseable = yes
writeable = yes

View file

@ -70,30 +70,51 @@ pcie_aspm_policy() {
cpu_perftune() {
CPUPOWERSAVE=$(get_setting system.power.cpu)
POWERSAVEENABLED=$(get_setting system.powersave)
CPU="$(awk '/vendor_id/ {print $3;exit}' /proc/cpuinfo)"
if [ "${CPUPOWERSAVE}" = "1" ] && \
[ "${POWERSAVEENABLED}" = "1" ]
then
CPU="$(awk '/vendor_id/ {print $3;exit}' /proc/cpuinfo)"
if [ "${CPU}" = "AuthenticAMD" ]
then
if [ "${1}" = "battery" ]
then
ryzenadj --power-saving >/dev/null 2>&1
else
ryzenadj --max-performance >/dev/null 2>&1
fi
elif [ "${CPU}" = "GenuineIntel" ]
then
for policy in $(find /sys/devices/system/cpu/cpufreq/policy*/ -name energy_performance_preference)
do
case ${CPU} in
AuthenticAMD)
if [ "${1}" = "battery" ]
then
echo power >${policy} >/dev/null 2>&1
ryzenadj --power-saving >/dev/null 2>&1
else
echo performance >${policy} >/dev/null 2>&1
ryzenadj --max-performance >/dev/null 2>&1
fi
done
fi
;;
esac
fi
case ${CPU} in
AuthenticAMD)
PSTATE="amd_pstate"
STATUS="active"
;;
GenuineIntel)
PSTATE="intel_pstate"
STATUS="passive"
;;
esac
if [ -f "/sys/devices/system/cpu/${PSTATE}/status" ]
then
echo ${STATUS} >/sys/devices/system/cpu/${PSTATE}/status
while [ ! -f /sys/devices/system/cpu/cpufreq/policy0/energy_performance_preference ]
do
sleep .25
done
for policy in $(find /sys/devices/system/cpu/cpufreq/policy*/ -name energy_performance_preference)
do
EPP=$(get_setting system.power.epp)
if [ -z "${EPP}" ]
then
EPP="performance"
set_setting system.power.epp ${EPP}
fi
echo ${EPP} >${policy} 2>/dev/null
done
fi
}

View file

@ -11,14 +11,16 @@
. /etc/profile
BATCNT=0
unset CURRENT_MODE
unset AC_STATUS
while true
do
if [ "$(get_setting system.powersave)" = 1 ]
then
STATUS="$(cat /sys/class/power_supply/{BAT*,bat*}/status 2>/dev/null)"
if [ ! "${STATUS}" = "${CURRENT_MODE}" ]
AC_STATUS="$(cat /sys/class/power_supply/[bB][aA][tT]*/status 2>/dev/null)"
if [[ ! "${CURRENT_MODE}" =~ ${AC_STATUS} ]]
then
case ${STATUS} in
case ${AC_STATUS} in
Disch*)
log $0 "Switching to battery mode."
if [ -e "/tmp/.gpu_performance_level" ]
@ -56,7 +58,7 @@ do
;;
esac
fi
CURRENT_MODE="${STATUS}"
CURRENT_MODE="${AC_STATUS}"
fi
### Until we have an overlay. :rofl:
if (( "${BATCNT}" >= "90" )) &&

View file

@ -1,12 +1,9 @@
#!/bin/sh
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
# Minimal OS variable loading for performance
. /etc/profile.d/001-functions
CPU_VENDOR=$(cpu_vendor)
case ${CPU_VENDOR} in
AuthenticAMD)
tocon "Configuring system TDP..."
@ -18,32 +15,4 @@ case ${CPU_VENDOR} in
fi
/usr/bin/overclock boot
;;
GenuineIntel)
tocon "Configuring system EPP..."
###
### Enable dynamic boost.
###
if [ -f "/sys/devices/system/cpu/intel_pstate/hwp_dynamic_boost" ]
then
echo 1 >/sys/devices/system/cpu/intel_pstate/hwp_dynamic_boost
fi
###
### Energy Performance Preference isn't writeable if pstates are in
### active mode.
###
if [ -f "/sys/devices/system/cpu/intel_pstate/status" ]
then
echo passive >/sys/devices/system/cpu/intel_pstate/status
fi
EPP=$(get_setting system.power.epp)
if [ ! -z ${EPP} ]
then
/usr/bin/set_epp
fi
;;
esac

View file

@ -15,17 +15,38 @@ then
PROFILE=$(get_setting system.power.epp)
if [ -z "${PROFILE}" ]
then
PROFILE="balance_performance"
PROFILE="performance"
set_setting system.power.epp ${PROFILE}
fi
else
PROFILE=$1
fi
CPU_VENDOR=$(cpu_vendor)
case ${PROFILE} in
*)
for POLICY in $(find /sys/devices/system/cpu/cpufreq -name policy[0-9]*)
do
echo ${PROFILE} >${POLICY}/energy_performance_preference 2>/dev/null
done
case ${CPU_VENDOR} in
AuthenticAMD)
PSTATE="amd_pstate"
STATUS="active"
;;
GenuineIntel)
PSTATE="intel_pstate"
STATUS="passive"
;;
esac
if [ -f "/sys/devices/system/cpu/${PSTATE}/status" ]
then
echo ${STATUS} >/sys/devices/system/cpu/${PSTATE}/status
while [ ! -f /sys/devices/system/cpu/cpufreq/policy0/energy_performance_preference ]
do
sleep .25
done
case ${PROFILE} in
*)
for POLICY in $(find /sys/devices/system/cpu/cpufreq -name policy[0-9]*)
do
echo ${PROFILE} >${POLICY}/energy_performance_preference 2>/dev/null
done
;;
esac
fi

View file

@ -119,7 +119,7 @@ allowed_media_dirs = /var/media, /media, /run/media/$USER
# allowed_devices = /dev/*
# WARNING: ALLOWING USERS TO MOUNT DEVICES OUTSIDE OF /dev CAN CAUSE SERIOUS
# SECURITY PROBLEMS. DO NOT ALLOW DEVICES IN /dev/shm
allowed_devices = /dev/*
allowed_devices = /dev/sd* /dev/nvme*
# allowed_internal_devices causes udevil to treat any listed block devices as

View file

@ -2,15 +2,15 @@
IMPORT{cmdline}="installer"
ENV{installer}=="1", GOTO="exit"
# check for blockdevices, /dev/sd*, /dev/sr* and /dev/mmc*
SUBSYSTEM!="block", KERNEL!="sd*|sr*|mmc*", GOTO="exit"
# check for blockdevices, /dev/sd*, /dev/sr*
SUBSYSTEM!="block", KERNEL!="sd*|sr*", GOTO="exit"
# check for special partitions we dont want mount
IMPORT{builtin}="blkid"
ENV{ID_FS_LABEL}=="EFI|BOOT|Recovery|RECOVERY|SETTINGS|boot|root0|share0", GOTO="exit"
# /dev/sd* and /dev/mmc* ith partitions/disk and filesystems only and /dev/sr* disks only
KERNEL=="sd*|mmc*", ENV{DEVTYPE}=="partition|disk", ENV{ID_FS_USAGE}=="filesystem", GOTO="harddisk"
# /dev/sd* with partitions/disk and filesystems only and /dev/sr* disks only
KERNEL=="sd*", ENV{DEVTYPE}=="partition|disk", ENV{ID_FS_USAGE}=="filesystem", GOTO="harddisk"
KERNEL=="sr*", ENV{DEVTYPE}=="disk", GOTO="optical"
GOTO="exit"

View file

@ -4,7 +4,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="es-theme-art-book-next"
PKG_VERSION="f17d52ed11f841a8352348c6bb7eed5fdce95420"
PKG_VERSION="15263a47b34d0a762139fd90aef927bfa6483f85"
PKG_ARCH="any"
PKG_LICENSE="CUSTOM"
PKG_SITE="https://github.com/anthonycaccese/art-book-next-jelos"

View file

@ -3,7 +3,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="emulationstation"
PKG_VERSION="ea0f95a"
PKG_VERSION="773c2f6"
PKG_GIT_CLONE_BRANCH="main"
PKG_REV="1"
PKG_ARCH="any"

View file

@ -1237,3 +1237,4 @@ makeinstall_target() {
cp ${PKG_DIR}/autostart/* ${INSTALL}/usr/lib/autostart/common
chmod 0755 ${INSTALL}/usr/lib/autostart/common/*
}

View file

@ -0,0 +1,13 @@
[Unit]
Description=Overlays directory
After=systemd-tmpfiles-setup.service
DefaultDependencies=no
[Mount]
What=none
Where=/storage/roms
Type=overlay
Options=lowerdir=/storage/games-external,upperdir=/storage/games-internal,workdir=/storage/.tmp/games-workdir
[Install]
WantedBy=jelos.target

View file

@ -2,5 +2,8 @@
# Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC)
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
d /storage/.tmp/games-workdir 0777 root root - -
d /storage/games-internal 0777 root root - -
d /storage/games-external 0777 root root - -
d /storage/roms 0777 root root - -
d /tmp/cache 0777 root root - -

View file

@ -0,0 +1,21 @@
# dont run in "installer" mode
IMPORT{cmdline}="installer"
ENV{installer}=="1", GOTO="exit"
SUBSYSTEM!="block", KERNEL!="mmc*", GOTO="exit"
# check for special partitions we dont want mount
IMPORT{builtin}="blkid"
ENV{ID_FS_LABEL}=="EFI|BOOT|Recovery|RECOVERY|SETTINGS|boot|root0|share0", GOTO="exit"
# /dev/mmc* partitions/disk and filesystems only
KERNEL=="mmc*", ENV{DEVTYPE}=="partition|disk", ENV{ID_FS_USAGE}=="filesystem", GOTO="harddisk"
GOTO="exit"
# mount or umount for hdds
LABEL="harddisk"
ACTION=="add", PROGRAM="/usr/bin/sh -c '/usr/bin/grep -E ^/dev/%k\ /proc/mounts || true'", RESULT=="", RUN+="/usr/bin/systemctl stop storage-roms.mount", RUN+="/usr/bin/systemctl restart jelos-automount.service"
GOTO="exit"
# Exit
LABEL="exit"

View file

@ -6502,7 +6502,7 @@ CONFIG_FUSE_FS=m
# CONFIG_CUSE is not set
# CONFIG_VIRTIO_FS is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
CONFIG_OVERLAY_FS_REDIRECT_DIR=y
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set

View file

@ -1,7 +1,9 @@
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-09-12 13:20:28.956694441 +0000
@@ -0,0 +1,1015 @@
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
new file mode 100644
index 000000000000..d0a7ba2c2bd4
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
@@ -0,0 +1,935 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2022 Neil Armstrong <narmstrong@kernel.org>
@ -359,86 +361,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+ clock-latency = <50000>;
+};
+
+/* RK817 only supports 12.5mV steps, round up the values */
+&cpu_opp_table_0 {
+ opp-1000000000 {
+ opp-microvolt = <737500>;
+ };
+ opp-1200000000 {
+ opp-microvolt = <737500>;
+ };
+ opp-1398000000 {
+ opp-microvolt = <762500>;
+ };
+ opp-1512000000 {
+ opp-microvolt = <800000>;
+ };
+ opp-1608000000 {
+ opp-microvolt = <837500>;
+ };
+ opp-1704000000 {
+ opp-microvolt = <862500>;
+ };
+ opp-1896000000 {
+ opp-microvolt = <987500>;
+ };
+ opp-1992000000 {
+ opp-microvolt = <1050000>;
+ };
+ opp-2016000000 {
+ opp-hz = /bits/ 64 <2016000000>;
+ opp-microvolt = <1050000>;
+ };
+};
+
+/* RK818 only supports 12.5mV steps, round up the values */
+&cpub_opp_table_1 {
+ opp-1000000000 {
+ opp-microvolt = <775000>;
+ };
+ opp-1200000000 {
+ opp-microvolt = <775000>;
+ };
+ opp-1398000000 {
+ opp-microvolt = <800000>;
+ };
+ opp-1512000000 {
+ opp-microvolt = <825000>;
+ };
+ opp-1608000000 {
+ opp-microvolt = <862500>;
+ };
+ opp-1704000000 {
+ opp-microvolt = <900000>;
+ };
+ opp-1800000000 {
+ opp-microvolt = <987500>;
+ };
+ opp-1908000000 {
+ opp-microvolt = <1025000>;
+ };
+ opp-2016000000 {
+ opp-hz = /bits/ 64 <2016000000>;
+ opp-microvolt = <1025000>;
+ };
+ opp-2100000000 {
+ opp-hz = /bits/ 64 <2100000000>;
+ opp-microvolt = <1025000>;
+ };
+ opp-2208000000 {
+ opp-hz = /bits/ 64 <2208000000>;
+ opp-microvolt = <1050000>;
+ };
+ opp-2304000000 {
+ opp-hz = /bits/ 64 <2304000000>;
+ opp-microvolt = <1050000>;
+ };
+ opp-2400000000 {
+ opp-hz = /bits/ 64 <2400000000>;
+ opp-microvolt = <1050000>;
+ };
+};
+
+&i2c_AO {
+ status = "okay";
+ pinctrl-0 = <&i2c_ao_sck_pins>, <&i2c_ao_sda_pins>;

View file

@ -1,7 +1,9 @@
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts linux/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts 2023-09-12 12:04:13.567330573 +0000
@@ -0,0 +1,989 @@
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts
new file mode 100644
index 000000000000..fd4f97b5ccd3
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts
@@ -0,0 +1,924 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2022 Neil Armstrong <narmstrong@kernel.org>
@ -348,71 +350,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-
+ clock-latency = <50000>;
+};
+
+/* RK817 only supports 12.5mV steps, round up the values */
+&cpu_opp_table_0 {
+ opp-1000000000 {
+ opp-microvolt = <760000>;
+ };
+ opp-1200000000 {
+ opp-microvolt = <780000>;
+ };
+ opp-1398000000 {
+ opp-microvolt = <800000>;
+ };
+ opp-1512000000 {
+ opp-microvolt = <860000>;
+ };
+ opp-1608000000 {
+ opp-microvolt = <900000>;
+ };
+ opp-1704000000 {
+ opp-microvolt = <950000>;
+ };
+ opp-1800000000 {
+ opp-microvolt = <1000000>;
+ };
+};
+
+/* RK818 only supports 12.5mV steps, round up the values */
+&cpub_opp_table_1 {
+ opp-1000000000 {
+ opp-microvolt = <775000>;
+ };
+ opp-1200000000 {
+ opp-microvolt = <775000>;
+ };
+ opp-1398000000 {
+ opp-microvolt = <800000>;
+ };
+ opp-1512000000 {
+ opp-microvolt = <825000>;
+ };
+ opp-1608000000 {
+ opp-microvolt = <862500>;
+ };
+ opp-1704000000 {
+ opp-microvolt = <900000>;
+ };
+ opp-1800000000 {
+ opp-microvolt = <987500>;
+ };
+ opp-1908000000 {
+ opp-microvolt = <1025000>;
+ };
+ opp-2016000000 {
+ opp-hz = /bits/ 64 <2016000000>;
+ opp-microvolt = <1025000>;
+ };
+ opp-2100000000 {
+ opp-hz = /bits/ 64 <2100000000>;
+ opp-microvolt = <1025000>;
+ };
+ opp-2208000000 {
+ opp-hz = /bits/ 64 <2208000000>;
+ opp-microvolt = <1050000>;
+ };
+};
+
+&i2c_AO {
+ status = "okay";
+ pinctrl-0 = <&i2c_ao_sck_pins>, <&i2c_ao_sda_pins>;

View file

@ -14,7 +14,7 @@
esac
# kernel command line
EXTRA_CMDLINE="quiet console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20 intel_pstate=active amd_pstate=active amd_pstate.shared_mem=1 amdgpu.dpm=1"
EXTRA_CMDLINE="quiet console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20 intel_pstate=passive amd_pstate=active amd_pstate.shared_mem=1 amdgpu.dpm=1"
# Partition label
PARTITION_TABLE="msdos"

View file

@ -5555,7 +5555,7 @@ CONFIG_FUSE_FS=m
CONFIG_CUSE=m
# CONFIG_VIRTIO_FS is not set
CONFIG_OVERLAY_FS=y
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
CONFIG_OVERLAY_FS_REDIRECT_DIR=y
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set

View file

@ -5156,7 +5156,7 @@ CONFIG_FUSE_FS=y
# CONFIG_CUSE is not set
# CONFIG_VIRTIO_FS is not set
CONFIG_OVERLAY_FS=y
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
CONFIG_OVERLAY_FS_REDIRECT_DIR=y
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set

View file

@ -5341,7 +5341,7 @@ CONFIG_INOTIFY_USER=y
CONFIG_FUSE_FS=y
# CONFIG_CUSE is not set
CONFIG_OVERLAY_FS=y
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
CONFIG_OVERLAY_FS_REDIRECT_DIR=y
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set

View file

@ -31,7 +31,7 @@
BOOTLOADER="u-boot"
PARTITION_TABLE="gpt"
UBOOT_LABEL="uboot"
TRUST_LABEL="trust"
TRUST_LABEL="resource"
DEVICE_DTB=("rk3566-evb2-lp4x-v10-linux")
UBOOT_DTB="rk3566"
UBOOT_CONFIG="rk3568_defconfig"
@ -41,7 +41,6 @@
PKG_BL31="${PKG_RKBIN}/bin/rk35/rk3568_bl31_v1.42.elf"
PKG_LOAD_ADDR="0x0a100000"
BOOT_INI=false
FDTDIR=false
EXT_LINUX_CONF=true
# Additional kernel make parameters (for example to specify the u-boot loadaddress)

View file

@ -5507,7 +5507,7 @@ CONFIG_INOTIFY_USER=y
CONFIG_FUSE_FS=y
# CONFIG_CUSE is not set
CONFIG_OVERLAY_FS=y
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
CONFIG_OVERLAY_FS_REDIRECT_DIR=y
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set

View file

@ -31,7 +31,7 @@
BOOTLOADER="u-boot"
PARTITION_TABLE="gpt"
UBOOT_LABEL="uboot"
TRUST_LABEL="trust"
TRUST_LABEL="resource"
DEVICE_DTB=("rk3566-rg353p-linux" "rk3566-rg353v-linux" "rk3566-rg353m-linux" "rk3566-rg503-linux" "rk3566-rk2023-linux" "rk3566-rgb30-linux")
UBOOT_DTB="rk3566"
UBOOT_CONFIG="rk3568_defconfig"

View file

@ -7295,7 +7295,7 @@ CONFIG_FUSE_FS=m
CONFIG_CUSE=m
# CONFIG_VIRTIO_FS is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
CONFIG_OVERLAY_FS_REDIRECT_DIR=y
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set

View file

@ -25,7 +25,7 @@ case ${DEVICE} in
;;
RK3566)
PKG_URL="${PKG_SITE}/rk356x-kernel.git"
PKG_VERSION="1e8f831c570eb50245a7dddfb9c7de58c9843f8e"
PKG_VERSION="d346337a7b3e3e7e0d12dbdcc4fc62efc86cbda3"
GET_HANDLER_SUPPORT="git"
PKG_GIT_CLONE_BRANCH="main"
;;
@ -35,7 +35,7 @@ case ${DEVICE} in
;;
*X55)
PKG_URL="${PKG_SITE}/rk3566-x55-kernel.git"
PKG_VERSION="9a85982a2"
PKG_VERSION="9b92751b8fe21f9326d1a54dd5f675965a12d6e1"
GET_HANDLER_SUPPORT="git"
PKG_GIT_CLONE_BRANCH="main"
;;

View file

@ -24,7 +24,7 @@ case ${DEVICE} in
;;
RK356*)
PKG_URL="${PKG_SITE}/rk356x-uboot.git"
PKG_VERSION="02e1249"
PKG_VERSION="88b2f26"
;;
RK3399)
PKG_URL="${PKG_SITE}/rk3399-uboot.git"

View file

@ -27,7 +27,6 @@ fi
if [ -n "${DEVICE_ROOT}" ]
then
if [ ! "${DEVICE_ROOT}" = "${DEVICE}" ]
then
# Ensure there isn't a left over build directory.
@ -58,11 +57,11 @@ then
ln -sf sources-${DEVICE_ROOT} sources-${DEVICE}
fi
fi
PKG_CLEAN+=" ${CLEAN_DEVICE_ROOT}"
fi
# Clean necessary packages.
PKG_CLEAN+=" ${CLEAN_NETWORK} ${CLEAN_OS_BASE} ${CLEAN_DEVICE_ROOT} ${CLEAN_PACKAGES}"
PKG_CLEAN+=" ${CLEAN_NETWORK} ${CLEAN_OS_BASE} ${CLEAN_PACKAGES}"
if [ ! -n "${DIRTY}" ]
then

View file

@ -80,19 +80,19 @@ STORAGE_PART_START=$(( ${SYSTEM_PART_END} + 1 ))
STORAGE_PART_END=$(( ${STORAGE_PART_START} + (${STORAGE_SIZE} * 1024 * 1024 / 512) - 1 ))
if [ "${PARTITION_TABLE}" = "gpt" ]; then
echo "image: Create boot partition."
echo "image: Create GPT boot partition."
parted -s "${DISK}" -a min unit s mkpart boot fat32 ${SYSTEM_PART_START} ${SYSTEM_PART_END}
else
echo "image: Create primary partition."
echo "image: Create MBR boot partition."
parted -s "${DISK}" -a min unit s mkpart primary fat32 ${SYSTEM_PART_START} ${SYSTEM_PART_END}
parted -s "${DISK}" set 1 boot on
fi
if [ "${PARTITION_TABLE}" = "gpt" ]; then
echo "image: Create storage partition."
echo "image: Create GPT storage partition."
parted -s "${DISK}" -a min unit s mkpart storage ext4 ${STORAGE_PART_START} ${STORAGE_PART_END}
else
echo "image: Create primary partition."
echo "image: Create MBR Storage partition."
parted -s "${DISK}" -a min unit s mkpart primary ext4 ${STORAGE_PART_START} ${STORAGE_PART_END}
fi
sync

View file

@ -47,6 +47,7 @@ for i in ${BUILD}/${PKG_NAME}-*; do
${SCRIPTS}/clean "${CLEAN_DEP}"
${SCRIPTS}/unpack "${CLEAN_DEP}"
done
${SCRIPTS}/clean initramfs
fi
fi
fi