mirror of
https://github.com/RROrg/rr.git
synced 2025-06-21 05:51:05 +08:00
Fix show menu "Show SATA(s) # ports and drives" to devicetree models.
Added alx addon
This commit is contained in:
parent
1f34f0b55d
commit
dc439a5d6c
2
TODO
2
TODO
@ -1,5 +1,7 @@
|
|||||||
A fazer
|
A fazer
|
||||||
- Descobrir como é o serial do DS2422+
|
- Descobrir como é o serial do DS2422+
|
||||||
|
- Mudar addons para colocar pacote completo na partição 3 e detectar dinâmicamente durante o boot do júnior
|
||||||
|
- Estudar acrescentar modo simples e avançado do menu
|
||||||
|
|
||||||
Concluidos:
|
Concluidos:
|
||||||
- Generalizar código dos addons
|
- Generalizar código dos addons
|
||||||
|
@ -350,8 +350,6 @@ function addonMenu() {
|
|||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
function cmdlineMenu() {
|
function cmdlineMenu() {
|
||||||
# Read device-tree flag
|
|
||||||
DT="`readModelKey "${MODEL}" "dt"`"
|
|
||||||
unset CMDLINE
|
unset CMDLINE
|
||||||
declare -A CMDLINE
|
declare -A CMDLINE
|
||||||
while IFS="=" read KEY VALUE; do
|
while IFS="=" read KEY VALUE; do
|
||||||
@ -359,11 +357,9 @@ function cmdlineMenu() {
|
|||||||
done < <(readConfigMap "cmdline" "${USER_CONFIG_FILE}")
|
done < <(readConfigMap "cmdline" "${USER_CONFIG_FILE}")
|
||||||
echo "a \"Add/edit an cmdline item\"" > "${TMP_PATH}/menu"
|
echo "a \"Add/edit an cmdline item\"" > "${TMP_PATH}/menu"
|
||||||
echo "d \"Delete cmdline item(s)\"" >> "${TMP_PATH}/menu"
|
echo "d \"Delete cmdline item(s)\"" >> "${TMP_PATH}/menu"
|
||||||
if [ "${DT}" != "true" ]; then
|
|
||||||
echo "u \"Show SATA(s) # ports and drives\"" >> "${TMP_PATH}/menu"
|
|
||||||
fi
|
|
||||||
echo "s \"Show user cmdline\"" >> "${TMP_PATH}/menu"
|
echo "s \"Show user cmdline\"" >> "${TMP_PATH}/menu"
|
||||||
echo "m \"Show model/build cmdline\"" >> "${TMP_PATH}/menu"
|
echo "m \"Show model/build cmdline\"" >> "${TMP_PATH}/menu"
|
||||||
|
echo "u \"Show SATA(s) # ports and drives\"" >> "${TMP_PATH}/menu"
|
||||||
echo "e \"Exit\"" >> "${TMP_PATH}/menu"
|
echo "e \"Exit\"" >> "${TMP_PATH}/menu"
|
||||||
# Loop menu
|
# Loop menu
|
||||||
while true; do
|
while true; do
|
||||||
@ -406,6 +402,22 @@ function cmdlineMenu() {
|
|||||||
deleteConfigKey "cmdline.${I}" "${USER_CONFIG_FILE}"
|
deleteConfigKey "cmdline.${I}" "${USER_CONFIG_FILE}"
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
|
s)
|
||||||
|
ITEMS=""
|
||||||
|
for KEY in ${!CMDLINE[@]}; do
|
||||||
|
ITEMS+="${KEY}: ${CMDLINE[$KEY]}\n"
|
||||||
|
done
|
||||||
|
dialog --backtitle "`backtitle`" --title "User cmdline" \
|
||||||
|
--aspect 18 --msgbox "${ITEMS}" 0 0
|
||||||
|
;;
|
||||||
|
m)
|
||||||
|
ITEMS=""
|
||||||
|
while IFS="=" read KEY VALUE; do
|
||||||
|
ITEMS+="${KEY}: ${VALUE}\n"
|
||||||
|
done < <(readModelMap "${MODEL}" "builds.${BUILD}.cmdline")
|
||||||
|
dialog --backtitle "`backtitle`" --title "Model/build cmdline" \
|
||||||
|
--aspect 18 --msgbox "${ITEMS}" 0 0
|
||||||
|
;;
|
||||||
u) TEXT=""
|
u) TEXT=""
|
||||||
NUMPORTS=0
|
NUMPORTS=0
|
||||||
for PCI in `lspci -d ::106 | awk '{print$1}'`; do
|
for PCI in `lspci -d ::106 | awk '{print$1}'`; do
|
||||||
@ -434,22 +446,6 @@ function cmdlineMenu() {
|
|||||||
dialog --backtitle "`backtitle`" --colors --aspect 18 \
|
dialog --backtitle "`backtitle`" --colors --aspect 18 \
|
||||||
--msgbox "${TEXT}" 0 0
|
--msgbox "${TEXT}" 0 0
|
||||||
;;
|
;;
|
||||||
s)
|
|
||||||
ITEMS=""
|
|
||||||
for KEY in ${!CMDLINE[@]}; do
|
|
||||||
ITEMS+="${KEY}: ${CMDLINE[$KEY]}\n"
|
|
||||||
done
|
|
||||||
dialog --backtitle "`backtitle`" --title "User cmdline" \
|
|
||||||
--aspect 18 --msgbox "${ITEMS}" 0 0
|
|
||||||
;;
|
|
||||||
m)
|
|
||||||
ITEMS=""
|
|
||||||
while IFS="=" read KEY VALUE; do
|
|
||||||
ITEMS+="${KEY}: ${VALUE}\n"
|
|
||||||
done < <(readModelMap "${MODEL}" "builds.${BUILD}.cmdline")
|
|
||||||
dialog --backtitle "`backtitle`" --title "Model/build cmdline" \
|
|
||||||
--aspect 18 --msgbox "${ITEMS}" 0 0
|
|
||||||
;;
|
|
||||||
e) return ;;
|
e) return ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
BIN
files/board/arpl/p3/addons/alx/apollolake-4.4.180.tgz
Normal file
BIN
files/board/arpl/p3/addons/alx/apollolake-4.4.180.tgz
Normal file
Binary file not shown.
BIN
files/board/arpl/p3/addons/alx/broadwell-4.4.180.tgz
Normal file
BIN
files/board/arpl/p3/addons/alx/broadwell-4.4.180.tgz
Normal file
Binary file not shown.
BIN
files/board/arpl/p3/addons/alx/broadwellnk-4.4.180.tgz
Normal file
BIN
files/board/arpl/p3/addons/alx/broadwellnk-4.4.180.tgz
Normal file
Binary file not shown.
BIN
files/board/arpl/p3/addons/alx/bromolow-3.10.108.tgz
Normal file
BIN
files/board/arpl/p3/addons/alx/bromolow-3.10.108.tgz
Normal file
Binary file not shown.
BIN
files/board/arpl/p3/addons/alx/denverton-4.4.180.tgz
Normal file
BIN
files/board/arpl/p3/addons/alx/denverton-4.4.180.tgz
Normal file
Binary file not shown.
BIN
files/board/arpl/p3/addons/alx/geminilake-4.4.180.tgz
Normal file
BIN
files/board/arpl/p3/addons/alx/geminilake-4.4.180.tgz
Normal file
Binary file not shown.
25
files/board/arpl/p3/addons/alx/manifest.yml
Normal file
25
files/board/arpl/p3/addons/alx/manifest.yml
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
version: 1
|
||||||
|
name: alx
|
||||||
|
description: "Driver for Qualcomm Atheros AR816x/AR817x ethernet adapters"
|
||||||
|
available-for:
|
||||||
|
bromolow-3.10.108:
|
||||||
|
install-script: &script "install.sh"
|
||||||
|
modules: true
|
||||||
|
apollolake-4.4.180:
|
||||||
|
install-script: *script
|
||||||
|
modules: true
|
||||||
|
broadwell-4.4.180:
|
||||||
|
install-script: *script
|
||||||
|
modules: true
|
||||||
|
broadwellnk-4.4.180:
|
||||||
|
install-script: *script
|
||||||
|
modules: true
|
||||||
|
denverton-4.4.180:
|
||||||
|
install-script: *script
|
||||||
|
modules: true
|
||||||
|
geminilake-4.4.180:
|
||||||
|
install-script: *script
|
||||||
|
modules: true
|
||||||
|
v1000-4.4.180:
|
||||||
|
install-script: *script
|
||||||
|
modules: true
|
BIN
files/board/arpl/p3/addons/alx/v1000-4.4.180.tgz
Normal file
BIN
files/board/arpl/p3/addons/alx/v1000-4.4.180.tgz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user