yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新 customDTS 函数以使用统一的 model.dts 文件

Browse Source
This commit is contained in:
Ing 2025-04-26 01:55:54 +08:00
parent c3b789dff1
commit d04e08ecd9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
files/initrd/opt/rr/menu.sh
View File

@ -1522,7 +1522,8 @@ function boot() {
function customDTS() { function customDTS() {
# Loop menu # Loop menu
while true; do while true; do
[ -f "${USER_UP_PATH}/${MODEL}.dts" ] && CUSTOMDTS="Yes" || CUSTOMDTS="No" [ -f "${USER_UP_PATH}/${MODEL}.dts" ] && mv -f "${USER_UP_PATH}/${MODEL}.dts" "${USER_UP_PATH}/model.dts"
[ -f "${USER_UP_PATH}/model.dts" ] && CUSTOMDTS="Yes" || CUSTOMDTS="No"
rm -f "${TMP_PATH}/menu" rm -f "${TMP_PATH}/menu"
{ {
echo "u \"$(TEXT "Upload dts file")\"" echo "u \"$(TEXT "Upload dts file")\""
@ -1539,7 +1540,7 @@ function customDTS() {
if ! tty 2>/dev/null | grep -q "/dev/pts"; then #if ! tty 2>/dev/null | grep -q "/dev/pts" || [ -z "${SSH_TTY}" ]; then if ! tty 2>/dev/null | grep -q "/dev/pts"; then #if ! tty 2>/dev/null | grep -q "/dev/pts" || [ -z "${SSH_TTY}" ]; then
MSG="" MSG=""
MSG+="$(TEXT "This feature is only available when accessed via ssh (Requires a terminal that supports ZModem protocol).\n")" MSG+="$(TEXT "This feature is only available when accessed via ssh (Requires a terminal that supports ZModem protocol).\n")"
MSG+="$(printf "$(TEXT "Or upload the dts file to %s via DUFS, Will be automatically imported when building.\n")" "${USER_UP_PATH}/${MODEL}.dts")" MSG+="$(printf "$(TEXT "Or upload the dts file to %s via DUFS, Will be automatically imported when building.\n")" "${USER_UP_PATH}/model.dts")"
DIALOG --title "$(TEXT "Custom DTS")" \ DIALOG --title "$(TEXT "Custom DTS")" \
--msgbox "${MSG}" 0 0 --msgbox "${MSG}" 0 0
return return
@ -1560,7 +1561,7 @@ function customDTS() {
--msgbox "${MSG}" 0 0 --msgbox "${MSG}" 0 0
else else
[ -d "{USER_UP_PATH}" ] || mkdir -p "${USER_UP_PATH}" [ -d "{USER_UP_PATH}" ] || mkdir -p "${USER_UP_PATH}"
cp -f "${USER_FILE}" "${USER_UP_PATH}/${MODEL}.dts" cp -f "${USER_FILE}" "${USER_UP_PATH}/model.dts"
DIALOG --title "$(TEXT "Custom DTS")" \ DIALOG --title "$(TEXT "Custom DTS")" \
--msgbox "$(TEXT "A valid dts file, Automatically import at compile time.")" 0 0 --msgbox "$(TEXT "A valid dts file, Automatically import at compile time.")" 0 0
fi fi
@ -1569,13 +1570,13 @@ function customDTS() {
touch "${PART1_PATH}/.build" touch "${PART1_PATH}/.build"
;; ;;
d) d)
rm -f "${USER_UP_PATH}/${MODEL}.dts" rm -f "${USER_UP_PATH}/model.dts"
touch "${PART1_PATH}/.build" touch "${PART1_PATH}/.build"
;; ;;
i) i)
rm -rf "${TMP_PATH}/model.dts" rm -rf "${TMP_PATH}/model.dts"
if [ -f "${USER_UP_PATH}/${MODEL}.dts" ]; then if [ -f "${USER_UP_PATH}/model.dts" ]; then
cp -f "${USER_UP_PATH}/${MODEL}.dts" "${TMP_PATH}/model.dts" cp -f "${USER_UP_PATH}/model.dts" "${TMP_PATH}/model.dts"
else else
ODTB="$(find "${PART2_PATH}" -type f -name "*.dtb" | head -1)" ODTB="$(find "${PART2_PATH}" -type f -name "*.dtb" | head -1)"
if [ -f "${ODTB}" ]; then if [ -f "${ODTB}" ]; then
@ -1598,7 +1599,7 @@ function customDTS() {
--msgbox "${MSG}" 0 0 --msgbox "${MSG}" 0 0
else else
mkdir -p "${USER_UP_PATH}" mkdir -p "${USER_UP_PATH}"
cp -f "${TMP_PATH}/modelEdit.dts" "${USER_UP_PATH}/${MODEL}.dts" cp -f "${TMP_PATH}/modelEdit.dts" "${USER_UP_PATH}/model.dts"
rm -r "${TMP_PATH}/model.dts" "${TMP_PATH}/modelEdit.dts" rm -r "${TMP_PATH}/model.dts" "${TMP_PATH}/modelEdit.dts"
touch "${PART1_PATH}/.build" touch "${PART1_PATH}/.build"
break break

1
files/initrd/opt/rr/ramdisk-patch.sh
View File

@ -186,6 +186,7 @@ for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "wol"
PARAMS="" PARAMS=""
if [ "${ADDON}" = "disks" ]; then if [ "${ADDON}" = "disks" ]; then
PARAMS=${HDDSORT} PARAMS=${HDDSORT}
[ -f "${USER_UP_PATH}/model.dts" ] && cp -f "${USER_UP_PATH}/model.dts" "${RAMDISK_PATH}/addons/model.dts"
[ -f "${USER_UP_PATH}/${MODEL}.dts" ] && cp -f "${USER_UP_PATH}/${MODEL}.dts" "${RAMDISK_PATH}/addons/model.dts" [ -f "${USER_UP_PATH}/${MODEL}.dts" ] && cp -f "${USER_UP_PATH}/${MODEL}.dts" "${RAMDISK_PATH}/addons/model.dts"
fi fi
installAddon "${ADDON}" "${PLATFORM}" "${KPRE:+${KPRE}-}${KVER}" || exit 1 installAddon "${ADDON}" "${PLATFORM}" "${KPRE:+${KPRE}-}${KVER}" || exit 1