diff --git a/TODO b/TODO index 439536a1..a2b2213c 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,7 @@ A fazer - 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: - Generalizar código dos addons diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index fcd11b0b..60170908 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -350,8 +350,6 @@ function addonMenu() { ############################################################################### function cmdlineMenu() { - # Read device-tree flag - DT="`readModelKey "${MODEL}" "dt"`" unset CMDLINE declare -A CMDLINE while IFS="=" read KEY VALUE; do @@ -359,11 +357,9 @@ function cmdlineMenu() { done < <(readConfigMap "cmdline" "${USER_CONFIG_FILE}") echo "a \"Add/edit an cmdline item\"" > "${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 "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" # Loop menu while true; do @@ -406,6 +402,22 @@ function cmdlineMenu() { deleteConfigKey "cmdline.${I}" "${USER_CONFIG_FILE}" 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="" NUMPORTS=0 for PCI in `lspci -d ::106 | awk '{print$1}'`; do @@ -434,22 +446,6 @@ function cmdlineMenu() { dialog --backtitle "`backtitle`" --colors --aspect 18 \ --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 ;; esac done diff --git a/files/board/arpl/p3/addons/alx/apollolake-4.4.180.tgz b/files/board/arpl/p3/addons/alx/apollolake-4.4.180.tgz new file mode 100644 index 00000000..2e04cd3a Binary files /dev/null and b/files/board/arpl/p3/addons/alx/apollolake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/alx/broadwell-4.4.180.tgz b/files/board/arpl/p3/addons/alx/broadwell-4.4.180.tgz new file mode 100644 index 00000000..92bd2f7e Binary files /dev/null and b/files/board/arpl/p3/addons/alx/broadwell-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/alx/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/addons/alx/broadwellnk-4.4.180.tgz new file mode 100644 index 00000000..eebc5b0d Binary files /dev/null and b/files/board/arpl/p3/addons/alx/broadwellnk-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/alx/bromolow-3.10.108.tgz b/files/board/arpl/p3/addons/alx/bromolow-3.10.108.tgz new file mode 100644 index 00000000..77b73c1f Binary files /dev/null and b/files/board/arpl/p3/addons/alx/bromolow-3.10.108.tgz differ diff --git a/files/board/arpl/p3/addons/alx/denverton-4.4.180.tgz b/files/board/arpl/p3/addons/alx/denverton-4.4.180.tgz new file mode 100644 index 00000000..acf05a17 Binary files /dev/null and b/files/board/arpl/p3/addons/alx/denverton-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/alx/geminilake-4.4.180.tgz b/files/board/arpl/p3/addons/alx/geminilake-4.4.180.tgz new file mode 100644 index 00000000..8630d1ee Binary files /dev/null and b/files/board/arpl/p3/addons/alx/geminilake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/alx/manifest.yml b/files/board/arpl/p3/addons/alx/manifest.yml new file mode 100644 index 00000000..5c683d72 --- /dev/null +++ b/files/board/arpl/p3/addons/alx/manifest.yml @@ -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 diff --git a/files/board/arpl/p3/addons/alx/v1000-4.4.180.tgz b/files/board/arpl/p3/addons/alx/v1000-4.4.180.tgz new file mode 100644 index 00000000..0faff7fb Binary files /dev/null and b/files/board/arpl/p3/addons/alx/v1000-4.4.180.tgz differ