Merge pull request #16 from fbelavenuto/dev

merge dev

.github/workflows/main.yml

@@ -1,13 +1,13 @@
-name: Build img
+name: Build image
 
 # Controls when the workflow will run
 on:
 
-#  push:
-#    branches:
-#      - main
-#  pull_request:
-  
+  # Push only in dev  
+  push:
+    branches:
+      - dev
+
   # When a release is published
   release:
     types: [published]
@@ -26,22 +26,21 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      # Install missing buildroot dependency
-      - name: Install dependency
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libelf-dev
 
+      # Check cache
       - name: Cache buildroot
         id: cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: .buildroot
           key: ${{ runner.os }}-${{ hashFiles('files/configs/arpl_defconfig') }}
 
+      # Install  dependencies
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libelf-dev qemu-utils
+
       # Prepare buildroot for first make (for cache)
       - name: Prepare buildroot
         if: steps.cache.outputs.cache-hit != 'true'
@@ -54,7 +53,7 @@ jobs:
           echo "Generating default config"
           make arpl_defconfig
           echo "First make"
-          make
+          make BR2_EXTERNAL=../external
 
       # Build incremental from cache
       - name: Build image
@@ -89,28 +88,32 @@ jobs:
           done
           # Copy files
           echo "Copying files"
-          cp -Ru files/* .buildroot/
-          VERSION=`cat VERSION`
           sed 's/^ARPL_VERSION=.*/ARPL_VERSION="'${VERSION}'"/' -i files/board/arpl/overlayfs/opt/arpl/include/consts.sh
+          cp -Ru files/* .buildroot/
           cd .buildroot
           echo "Generating default config"
           make arpl_defconfig
           echo "Version: ${VERSION}"
           echo "Building..."
-          make
+          make BR2_EXTERNAL=../external
           cd -
+          qemu-img convert -O vmdk arpl.img arpl.vmdk
 
       # Zip image
       - name: Pack
         shell: bash
-        run: zip -9 "arpl-${{ steps.build.outputs.VERSION }}.img.zip" arpl.img
+        run: |
+          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.img.zip" arpl.img
+          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk.zip" arpl.vmdk
 
       # Upload artifact
       - name: Upload
         uses: actions/upload-artifact@v3
         with:
-          name: Image to burn
-          path: arpl.img
+          name: Images
+          path: |
+            arpl.img
+            arpl.vmdk
           retention-days: 1
 
       # Publish a release if is a tag
@@ -120,5 +123,6 @@ jobs:
         with:
           files: |
             arpl-${{ steps.build.outputs.VERSION }}.img.zip
+            arpl-${{ steps.build.outputs.VERSION }}.vmdk.zip
             .buildroot/output/images/bzImage
             .buildroot/output/images/rootfs.cpio.xz

.gitignore

@@ -1,6 +1,7 @@
 !.gitkeep
 .vscode
-arpl.img*
+arpl.img
+arpl.vmdk
 *.zip
 .buildroot
 test.sh

TODO

@@ -18,6 +18,8 @@ Concluidos:
  - Usando TTYD para acesso via web
  - Verificar se fica legal colocar na config dos modelos os addons obrigatórios como o qjs-dtb *** Usado outra maneira ***
  - Implementar escolha de maxdisks
-
+ - Limpar addons quando usuário muda de modelo
+ - Arrumar detecção de discos/maxdisks. 918 tem só 4 discos e dá problema com proxmox
+ - Melhorar opções de HD, talvez criar um menu a parte
 
 https://kb.synology.com/en-me/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have

VERSION

@@ -1 +1 @@
-0.1-alpha3
+0.1-alpha7

external/Config.in

@@ -0,0 +1,2 @@
+source "$BR2_EXTERNAL_ARPL_PATH/r8125/Config.in"
+source "$BR2_EXTERNAL_ARPL_PATH/r8168/Config.in"

external/external.desc

@@ -0,0 +1,2 @@
+name: ARPL
+desc: ARPL external packages

external/external.mk

@@ -0,0 +1 @@
+include $(sort $(wildcard $(BR2_EXTERNAL_ARPL_PATH)/*/*.mk))

external/r8125/Config.in

@@ -0,0 +1,10 @@
+config BR2_PACKAGE_R8125
+	bool "r8125"
+	depends on BR2_LINUX_KERNEL
+	help
+	  A standalone driver for the RTL8125 Ethernet adapter.
+
+	  https://github.com/fbelavenuto/r8125
+
+comment "r8125 needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL

external/r8125/r8125.hash

@@ -0,0 +1,2 @@
+# Locally computed
+sha256  fe2420e69ae653e989e8ae754d4e3b5740d62b6e19911d88553106aaeaac97b4  r8125-99cd3bc868e4ba82a473d8efaedad04fedb0c0f7.tar.gz

external/r8125/r8125.mk

@@ -0,0 +1,13 @@
+################################################################################
+#
+# r8125
+#
+################################################################################
+
+R8125_VERSION = 99cd3bc868e4ba82a473d8efaedad04fedb0c0f7
+R8125_SITE = $(call github,fbelavenuto,r8125,$(R8125_VERSION))
+R8125_LICENSE = GPL-2.0
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
+

external/r8168/Config.in

@@ -0,0 +1,10 @@
+config BR2_PACKAGE_R8168
+	bool "r8168"
+	depends on BR2_LINUX_KERNEL
+	help
+	  A standalone driver for the RTL8168 Ethernet adapter.
+
+	  https://github.com/fbelavenuto/r8168
+
+comment "r8168 needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL

external/r8168/r8168.hash

@@ -0,0 +1,2 @@
+# Locally computed
+sha256  36c4ba7779259c0eee8d496ba600e5935dc8ce7b978e1dc023e1ee7de713d97e  r8168-52c98bd764e6dd22ff17876afa655e9e11237cc9.tar.gz

external/r8168/r8168.mk

@@ -0,0 +1,12 @@
+################################################################################
+#
+# r8168
+#
+################################################################################
+
+R8168_VERSION = 52c98bd764e6dd22ff17876afa655e9e11237cc9
+R8168_SITE = $(call github,fbelavenuto,r8168,$(R8168_VERSION))
+R8168_LICENSE = GPL-2.0
+
+$(eval $(kernel-module))
+$(eval $(generic-package))

files/board/arpl/kernel_defconfig

@@ -161,6 +161,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NETCONSOLE=y
 CONFIG_VIRTIO_NET=m
 CONFIG_ET131X=m
+CONFIG_SLICOSS=m
 CONFIG_ACENIC=m
 CONFIG_AMD_XGBE=m
 CONFIG_ATL1=m
@@ -170,11 +171,16 @@ CONFIG_ALX=m
 CONFIG_CNIC=m
 CONFIG_TIGON3=y
 CONFIG_BNX2X=m
+CONFIG_BNA=m
 CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
 CONFIG_NET_TULIP=y
 CONFIG_DL2K=m
 CONFIG_BE2NET=m
+CONFIG_HINIC=m
 CONFIG_E100=y
 CONFIG_E1000=y
 CONFIG_E1000E=y
@@ -183,6 +189,12 @@ CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
 CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+CONFIG_ICE=m
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_JME=m
+CONFIG_MVMDIO=m
 CONFIG_SKGE=m
 CONFIG_SKY2=y
 CONFIG_MLX4_EN=m
@@ -193,13 +205,23 @@ CONFIG_FORCEDETH=m
 CONFIG_QLCNIC=m
 CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
-CONFIG_BNA=m
 CONFIG_QCOM_EMAC=m
 CONFIG_R8169=m
 CONFIG_SXGBE_ETH=m
+CONFIG_SFC=m
+# CONFIG_SFC_MCDI_MON is not set
+# CONFIG_SFC_MCDI_LOGGING is not set
+CONFIG_SFC_FALCON=m
 CONFIG_SIS190=m
 CONFIG_STMMAC_ETH=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_DWC_XLGMAC=m
+CONFIG_TEHUTI=m
+CONFIG_VIA_VELOCITY=m
 CONFIG_XILINX_AXI_EMAC=m
+CONFIG_XILINX_LL_TEMAC=m
 CONFIG_REALTEK_PHY=y
 # CONFIG_USB_NET_DRIVERS is not set
 # CONFIG_WLAN is not set

files/board/arpl/overlayfs/etc/inittab

@@ -30,7 +30,7 @@ null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr
 
 # Login in terminals
 ::respawn:/sbin/agetty -a root --noclear tty1
-ttyS0::askfirst:/sbin/agetty -a root ttyS0 115200 vt100
+ttyS0::askfirst:/sbin/agetty -a root ttyS0 115200 linux
 ::respawn:/usr/bin/ttyd login -f root
 
 # Stuff to do for the 3-finger salute

files/board/arpl/overlayfs/opt/arpl/boot.sh

@@ -75,10 +75,13 @@ EFI_BUG="`readModelKey "${MODEL}" "builds.${BUILD}.efi-bug"`"
 LOADER_DISK="`blkid | grep 'LABEL="ARPL3"' | cut -d3 -f1`"
 BUS=`udevadm info --query property --name ${LOADER_DISK} | grep ID_BUS | cut -d= -f2`
 
+# Read SATADoM type
+DOM="`readModelKey "${MODEL}" "dom"`"
+
 # Prepare command line
 CMDLINE_LINE=""
 [ ${EFI} -eq 1 ] && CMDLINE_LINE+="withefi "
-[ "${BUS}" = "ata" ] && CMDLINE_LINE+="synoboot_satadom=1 "
+[ "${BUS}" = "ata" ] && CMDLINE_LINE+="synoboot_satadom=${DOM} "
 CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8250,io,0x3f8,115200n8 elevator=elevator root=/dev/md0 loglevel=15"
 for KEY in ${!CMDLINE[@]}; do
   VALUE="${CMDLINE[${KEY}]}"
@@ -92,6 +95,23 @@ CMDLINE_LINE=`echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g'`
 echo -e "Model: \033[1;36m${MODEL}\033[0m"
 echo -e "Build: \033[1;36m${BUILD}\033[0m"
 echo -e "Cmdline:\n\033[1;36m${CMDLINE_LINE}\033[0m"
+
+# Wait for an IP
+COUNT=0
+echo -n "IP: "
+while true; do
+  IP=`ip route get 1.1.1.1 2>/dev/null | awk '{print$7}'`
+  if [ -n "${IP}" ]; then
+    echo -e "\033[1;32m${IP}\033[0m"
+    break
+  elif [ ${COUNT} -eq 8 ]; then
+    echo -e "\033[1;31mERROR\033[0m"
+    break
+  fi
+  COUNT=$((${COUNT}+1))
+  sleep 1
+done
+
 echo -e "\033[1;37mLoading DSM kernel...\033[0m"
 
 # Executes DSM kernel via KEXEC

files/board/arpl/overlayfs/opt/arpl/include/consts.sh

@@ -1,5 +1,5 @@
 
-ARPL_VERSION="0.1-alpha3"
+ARPL_VERSION="0.1-alpha7"
 
 # Define paths
 TMP_PATH="/tmp"

files/board/arpl/overlayfs/opt/arpl/menu.sh

@@ -103,6 +103,8 @@ function modelMenu() {
     rm -f "${MOD_ZIMAGE_FILE}"
     rm -f "${MOD_RDGZ_FILE}"
     DIRTY=1
+    # Remove addons
+    writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
   fi
 }
 
@@ -346,40 +348,25 @@ function addonMenu() {
   done
 }
 
-###############################################################################
-# Sets variables to configure maxdisks
-# 1 - Number of disks
-function setMaxDisks() {
-  CMDLINE['maxdisks']="${1}"
-  writeConfigKey "cmdline.maxdisks" "${1}" "${USER_CONFIG_FILE}"
-  INTPORTCFG=""
-  for I in `seq 1 ${1}`; do INTPORTCFG+="1"; done
-  INTPORTCFG="0x`printf "%x" "$((2#${INTPORTCFG}))"`"
-  CMDLINE['internalportcfg']="${INTPORTCFG}"
-  writeConfigKey "cmdline.internalportcfg" "${INTPORTCFG}" "${USER_CONFIG_FILE}"
-}
-
 ###############################################################################
 function cmdlineMenu() {
-  # Read from user config
+  # Read device-tree flag
   DT="`readModelKey "${MODEL}" "dt"`"
   unset CMDLINE
   declare -A CMDLINE
   while IFS="=" read KEY VALUE; do
     [ -n "${KEY}" ] && CMDLINE["${KEY}"]="${VALUE}"
   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 "e \"Exit\""                                            >> "${TMP_PATH}/menu"
   # Loop menu
   while true; do
-    echo "a \"Add/edit an cmdline item\""                        > "${TMP_PATH}/menu"
-    echo "d \"Delete cmdline item(s)\""                          >> "${TMP_PATH}/menu"
-    echo "s \"Show user cmdline\""                               >> "${TMP_PATH}/menu"
-    echo "m \"Show model/build cmdline\""                        >> "${TMP_PATH}/menu"
-    if [ "${DT}" != "true" ]; then
-      echo "h \"Change maxdisks\""                               >> "${TMP_PATH}/menu"
-      echo "u \"Show SATA(s) # ports and drives\""               >> "${TMP_PATH}/menu"
-    fi
-    echo "e \"Exit\""                                            >> "${TMP_PATH}/menu"
-
     dialog --backtitle "`backtitle`" --menu "Choose a option" 0 0 0 \
       --file "${TMP_PATH}/menu" 2>${TMP_PATH}/resp
     [ $? -ne 0 ] && return
@@ -419,36 +406,8 @@ 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
-        ;;
-      h) MODEL_DISKS="`readModelKey "${MODEL}" "disks"`"
-        dialog --backtitle "`backtitle`"  --title "Change max of disks" \
-          --inputbox "${MODEL} disks: ${MODEL_DISKS}\nType the desired number of disks (1-26)" 0 0 \
-          2>${TMP_PATH}/resp
-        [ $? -ne 0 ] && continue
-        VALUE="`<"${TMP_PATH}/resp"`"
-        [ -z "${VALUE}" ] && continue
-        if [ ${VALUE} -ge 1 -a ${VALUE} -le 26 ]; then
-          setMaxDisks ${VALUE}
-        else
-          dialog --backtitle "`backtitle`" --msgbox "Invalid number" 0 0
-        fi
-        ;;
       u) TEXT=""
+        NUMPORTS=0
         for PCI in `lspci -d ::106 | awk '{print$1}'`; do
           NAME=`lspci -s "${PCI}" | sed "s/\ .*://"`
           TEXT+="\Zb${NAME}\Zn\nPorts: "
@@ -466,13 +425,31 @@ function cmdlineMenu() {
             [ ${ATTACH} -eq 1 ] && TEXT+="\Z2\Zb"
             [ ${DUMMY} -eq 1 ] && TEXT+="\Z1"
             TEXT+="${PORT}\Zn "
+            NUMPORTS=$((${NUMPORTS}+1))
           done < <(echo ${!HOSTPORTS[@]} | tr ' ' '\n' | sort -n)
           TEXT+="\n"
         done
+        TEXT+="\nTotal of ports: ${NUMPORTS}\n"
         TEXT+="\nPorts with color \Z1red\Zn as DUMMY, color \Z2\Zbgreen\Zn has drive connected."
         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
@@ -486,16 +463,17 @@ function synoinfoMenu() {
   while IFS="=" read KEY VALUE; do
     [ -n "${KEY}" ] && SYNOINFO["${KEY}"]="${VALUE}"
   done < <(readConfigMap "synoinfo" "${USER_CONFIG_FILE}")
+
+  echo "a \"Add/edit an synoinfo item\""   > "${TMP_PATH}/menu"
+  echo "d \"Delete synoinfo item(s)\""    >> "${TMP_PATH}/menu"
+  echo "s \"Show user synoinfo\""         >> "${TMP_PATH}/menu"
+  echo "m \"Show model/build synoinfo\""  >> "${TMP_PATH}/menu"
+  echo "e \"Exit\""                       >> "${TMP_PATH}/menu"
+
   # menu loop
   while true; do
-    dialog --backtitle "`backtitle`" \
-      --menu "Choose a option" 0 0 0 \
-      a "Add/edit an synoinfo item" \
-      d "Delete synoinfo item(s)" \
-      s "Show user synoinfo" \
-      m "Show model/build synoinfo" \
-      e "Exit" \
-      2>${TMP_PATH}/resp
+    dialog --backtitle "`backtitle`" --menu "Choose a option" 0 0 0 \
+      --file "${TMP_PATH}/menu" 2>${TMP_PATH}/resp
     [ $? -ne 0 ] && return
     case "`<${TMP_PATH}/resp`" in
       a)
@@ -795,6 +773,122 @@ function keymapMenu() {
   zcat /usr/share/keymaps/i386/qwerty/${KEYMAP}.map.gz | loadkeys
 }
 
+###############################################################################
+function updateMenu() {
+  while true; do
+    dialog --backtitle "`backtitle`" --menu "Choose a option" 0 0 0 \
+      a "Update arpl" \
+      d "Update addons" \
+      l "Update LKMs" \
+      e "Exit" \
+      2>${TMP_PATH}/resp
+    [ $? -ne 0 ] && return
+    case "`<${TMP_PATH}/resp`" in
+      a)
+        dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
+          --infobox "Checking last version" 0 0
+        ACTUALVERSION="v${ARPL_VERSION}"
+        TAG="`curl --insecure -s https://api.github.com/repos/fbelavenuto/arpl/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`"
+        if [ $? -ne 0 -o -z "${TAG}" ]; then
+          dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
+            --msgbox "Error checking new version" 0 0
+          continue
+        fi
+        if [ "${ACTUALVERSION}" = "${TAG}" ]; then
+          dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
+            --yesno "No new version. Actual version is ${ACTUALVERSION}\nForce update?" 0 0
+          [ $? -ne 0 ] && continue
+        fi
+        dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
+          --infobox "Downloading last version ${TAG}" 0 0
+        curl --insecure -s -L "https://github.com/fbelavenuto/arpl/releases/download/${TAG}/bzImage" -o /tmp/bzImage
+        if [ $? -ne 0 ]; then
+          dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
+            --msgbox "Error downloading bzImage" 0 0
+          continue
+        fi
+        curl --insecure -s -L "https://github.com/fbelavenuto/arpl/releases/download/${TAG}/rootfs.cpio.xz" -o /tmp/rootfs.cpio.xz
+        if [ $? -ne 0 ]; then
+          dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
+            --msgbox "Error downloading rootfs.cpio.xz" 0 0
+          continue
+        fi
+        dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
+          --infobox "Installing new files" 0 0
+        mv /tmp/bzImage /mnt/p1/bzImage-arpl
+        mv /tmp/rootfs.cpio.xz /mnt/p1/initrd-arpl
+        dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
+          --yesno "Arpl updated with success to ${TAG}!\nReboot?" 0 0
+        [ $? -ne 0 ] && continue
+        reboot
+        exit
+        ;;
+
+      d)
+        dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
+          --infobox "Checking last version" 0 0
+        TAG=`curl --insecure -s https://api.github.com/repos/fbelavenuto/arpl-addons/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
+        if [ $? -ne 0 -o -z "${TAG}" ]; then
+          dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
+            --msgbox "Error checking new version" 0 0
+          continue
+        fi
+        dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
+          --infobox "Downloading last version" 0 0
+        curl --insecure -s -L "https://github.com/fbelavenuto/arpl-addons/releases/download/${TAG}/addons.zip" -o /tmp/addons.zip
+        if [ $? -ne 0 ]; then
+          dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
+            --msgbox "Error downloading new version" 0 0
+          continue
+        fi
+        dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
+          --infobox "Extracting last version" 0 0
+        rm -rf /tmp/addons
+        mkdir -p /tmp/addons
+        unzip /tmp/addons.zip -d /tmp/addons >/dev/null 2>&1
+        dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
+          --infobox "Installing new addons" 0 0
+        DEST_PATH="/mnt/p3/addons"
+        for PKG in `ls /tmp/addons/*.addon`; do
+          ADDON=`basename ${PKG} | sed 's|.addon||'`
+          rm -rf "${DEST_PATH}/${ADDON}"
+          mkdir -p "${DEST_PATH}/${ADDON}"
+          tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}" >/dev/null 2>&1
+        done
+        dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
+          --msgbox "Addons updated with success!" 0 0
+        ;;
+
+      l)
+        dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+          --infobox "Checking last version" 0 0
+        TAG=`curl --insecure -s https://api.github.com/repos/fbelavenuto/redpill-lkm/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
+        if [ $? -ne 0 -o -z "${TAG}" ]; then
+          dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+            --msgbox "Error checking new version" 0 0
+          continue
+        fi
+        dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+          --infobox "Downloading last version" 0 0
+        curl --insecure -s -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip
+        if [ $? -ne 0 ]; then
+          dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+            --msgbox "Error downloading new version" 0 0
+          continue
+        fi
+        dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+          --infobox "Extracting last version" 0 0
+        rm -rf /mnt/p3/lkms/*
+        unzip /tmp/rp-lkms.zip -d /mnt/p3/lkms >/dev/null 2>&1
+        dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+          --msgbox "LKMs updated with success!" 0 0
+        ;;
+
+      e) return ;;
+    esac
+  done
+}
+
 ###############################################################################
 ###############################################################################
 
@@ -817,6 +911,7 @@ while true; do
   echo "u \"Edit user config file manually\""         >> "${TMP_PATH}/menu"
   echo "k \"Choose a keymap\" "                       >> "${TMP_PATH}/menu"
   [ ${RAMCACHE} -eq 0 -a -d "${CACHE_PATH}/dl" ] && echo "c \"Clean disk cache\"" >> "${TMP_PATH}/menu"
+  echo "p \"Update menu\""                            >> "${TMP_PATH}/menu"
   echo "e \"Exit\"" >> "${TMP_PATH}/menu"
   dialog --clear --default-item ${NEXT} --backtitle "`backtitle`" --colors \
     --menu "Choose the option" 0 0 0 --file "${TMP_PATH}/menu" \
@@ -839,8 +934,10 @@ while true; do
     k) keymapMenu ;;
     c) dialog --backtitle "`backtitle`" --title "Cleaning" --aspect 18 \
       --prgbox "rm -rfv \"${CACHE_PATH}/dl\"" 0 0 ;;
+    p) updateMenu ;;
     e) break ;;
   esac
 done
 clear
 echo -e "Call \033[1;32mmenu.sh\033[0m to return to menu"
+

files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml

@@ -2,15 +2,17 @@ id: "DS1621+"
 modules-notneeded: &modules-notneeded
   - ahci
   - ata_piix
+  - amd_xgbe
+  - marvell10g
   - i40e
+  - r8168
+  - r8169
   - ixgbe
-  - igb
-  - e1000e
-  - dca
   - etxhci_hcd
   - xhci_hcd
   - ehci-pci
   - uhci_hcd
+  - mv14xx
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
@@ -34,6 +36,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
 platform: "v1000"
+dom: 2
 serial:
   prefix:
     - "2080"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml

@@ -2,15 +2,16 @@ id: "DS2422+"
 modules-notneeded: &modules-notneeded
   - ahci
   - ata_piix
+  - amd_xgbe
+  - marvell10g
   - i40e
+  - r8168
   - ixgbe
-  - igb
-  - e1000e
-  - dca
   - etxhci_hcd
   - xhci_hcd
   - ehci-pci
   - uhci_hcd
+  - mv14xx
 synoinfo: &synoinfo
   rss_server: "http://example.com/null.xml"
   rss_server_ssl: "https://example.com/null.xml"
@@ -30,6 +31,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
 platform: "v1000"
+dom: 2
 serial:
   prefix:
     - "0000"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml

@@ -25,7 +25,6 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "bromolow"
 serial:
   prefix: 
@@ -36,6 +35,7 @@ serial:
   middle: "LWN"
   suffix: "numeric"
 disks: 12
+dom: 1
 builds:
   42218:
     ver: "7.0.1"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml

@@ -10,6 +10,7 @@ modules-notneeded: &modules-notneeded
   - xhci_pci
   - xhci_hcd
   - uhci_hcd
+  - mv14xx
 synoinfo: &synoinfo
   esataportcfg: "0x00"
   usbportcfg: "0x8700"
@@ -28,8 +29,8 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "broadwell"
+dom: 1
 serial:
   prefix:
     - "1130"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml

@@ -3,16 +3,17 @@ modules-notneeded: &modules-notneeded
   - ahci
   - ata_piix
   - i40e
+  - r8168
+  - r8169
   - ixgbe
   - igb
   - e1000e
-  - r8168
-  - r8169
   - dca
   - etxhci_hcd
   - xhci_hcd
   - ehci-pci
   - uhci_hcd
+  - mv14xx
 synoinfo: &synoinfo
   esataportcfg: "0x00"
   support_bde_internal_10g: "no"
@@ -35,8 +36,8 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "broadwellnk"
+dom: 1
 serial:
   prefix:
     - "2030"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml

@@ -2,14 +2,12 @@ id: "DS918+"
 modules-notneeded: &modules-notneeded
   - ahci
   - ata_piix
-  - i40e
-  - ixgbe
+  - r8168
+  - r8169
   - igb
   - e1000e
-  - dca
   - etxhci_hcd
   - xhci_hcd
-  - ehci-pci
   - uhci_hcd
 synoinfo: &synoinfo
   esataportcfg: "0x00"
@@ -31,8 +29,8 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "apollolake"
+dom: 2
 serial:
   prefix:
     - "1780"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml

@@ -2,14 +2,10 @@ id: "DS920+"
 modules-notneeded: &modules-notneeded
   - ahci
   - ata_piix
-  - i40e
-  - ixgbe
-  - igb
-  - e1000e
-  - dca
+  - r8168
+  - r8169
   - etxhci_hcd
   - xhci_hcd
-  - ehci-pci
   - uhci_hcd
 synoinfo: &synoinfo
   rss_server: "http://example.com/null.xml"
@@ -29,6 +25,8 @@ cmdline: &cmdline
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
 platform: "geminilake"
+dom: 2
+dt: true
 serial:
   prefix:
     - "2030"
@@ -51,9 +49,9 @@ builds:
       <<: *synoinfo
     pat:
       url: "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS920%2B_42218.pat"
-      hash: "73053911bd118b432d5a2036dc62d518eed83b78b32c1eb23696d59725a14892"
-      ramdisk-hash: "e39890f4bef2e5e4eea956996b0dd92d081c6d9e7c393331131e65bbad1a17a9"
-      zimage-hash: "74d513aaa3e30d8aa4f80e202d94a68a552e9c0472f8470e133ad29080556f55"
+      hash: "fe2a4648f76adeb65c3230632503ea36bbac64ee88b459eb9bfb5f3b8c8cebb3"
+      ramdisk-hash: "f7dd1317f24ec6b9bac839e37f66b59030218c7f97c06f73f1f54ed0f892c4aa"
+      zimage-hash: "346b68f662b50f47d3ee6c2bc9de6302e4b60436142c24ee88b620c7afd1ba06"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"

files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml

@@ -2,16 +2,18 @@ id: "DVA1622"
 modules-notneeded: &modules-notneeded
   - ahci
   - ata_piix
-  - i40e
-  - ixgbe
-  - igb
-  - e1000e
-  - dca
+  - r8168
+  - r8169
   - etxhci_hcd
   - xhci_hcd
-  - ehci-pci
   - uhci_hcd
-
+  - i915
+  - drm
+  - fb
+  - fbdev
+  - video
+  - backlight
+  - button
 synoinfo: &synoinfo
   buzzeroffen: "0xffff"
   rss_server: "http://example.com/null.xml"
@@ -32,6 +34,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
 platform: "geminilake"
+dom: 2
 serial:
   prefix:
     - "2030"

files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml

@@ -6,7 +6,6 @@ modules-notneeded: &modules-notneeded
   - ixgbe
   - igb
   - e1000e
-  - dca
   - etxhci_hcd
   - xhci_hcd
   - ehci-pci
@@ -30,8 +29,8 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "denverton"
+dom: 2
 serial:
   prefix:
     - "2030"

files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml.disabled

@@ -30,8 +30,8 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "broadwellnk"
+dom: 1
 serial:
   prefix:
     - "0000"

files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh

@@ -62,6 +62,18 @@ while read f; do
   (cd "${RAMDISK_PATH}" && patch -p1 < "${PATCH_PATH}/${f}") >>"${LOG_FILE}" 2>&1 || dieLog
 done < <(readModelArray "${MODEL}" "builds.${BUILD}.patch")
 
+# Temporary workaround
+# LOADER_DISK="`blkid | grep 'LABEL="ARPL3"' | cut -d3 -f1`"
+# BUS=`udevadm info --query property --name ${LOADER_DISK} | grep ID_BUS | cut -d= -f2`
+# DT="`readModelKey "${MODEL}" "dt"`"
+# if [ "${DT}" != "true" ]; then
+#   NUMPORTS=$((`ls /sys/class/scsi_host | wc -w`-1))
+#   [ "${BUS}" = "ata" ] && NUMPORTS=$((${NUMPORTS}-1))
+#   SYNOINFO["maxdisks"]=${NUMPORTS}
+#   INTPORTCFG="0x`printf "%x" "$((2**${NUMPORTS}-1))"`"
+#   SYNOINFO["internalportcfg"]="${INTPORTCFG}"
+# fi
+
 # Patch /etc/synoinfo.conf
 echo -n "."
 for KEY in ${!SYNOINFO[@]}; do

files/board/arpl/p3/addons/e1000e/manifest.yml

@@ -2,23 +2,8 @@ version: 1
 name: e1000e
 description: "Driver for Intel(R) PRO/1000 Gigabit Ethernet PCI-e 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
+    install-script: &script "install.sh"
     modules: true
   v1000-4.4.180:
     install-script: *script

files/board/arpl/p3/addons/ehci-pci/manifest.yml

@@ -5,3 +5,9 @@ available-for:
   broadwell-4.4.180:
     install-script: &script "install.sh"
     modules: true
+  geminilake-4.4.180:
+    install-script: *script
+    modules: true
+  apollolake-4.4.180:
+    install-script: *script
+    modules: true

files/board/arpl/p3/addons/i40e/manifest.yml

@@ -0,0 +1,10 @@
+version: 1
+name: i40e
+description: "Driver for Intel(R) Ethernet Connection XL710 adapter"
+available-for:
+  apollolake-4.4.180:
+    install-script: &script "install.sh"
+    modules: true
+  geminilake-4.4.180:
+    install-script: *script
+    modules: true

files/board/arpl/p3/addons/igb/manifest.yml

@@ -0,0 +1,10 @@
+version: 1
+name: igb
+description: "Driver for Intel(R) 82575 PCI-Express ethernet adapter"
+available-for:
+  geminilake-4.4.180:
+    install-script: &script "install.sh"
+    modules: true
+  v1000-4.4.180:
+    install-script: *script
+    modules: true

files/board/arpl/p3/addons/ixgbe/manifest.yml

@@ -0,0 +1,10 @@
+version: 1
+name: ixgbe
+description: "Driver for Intel(R) 10GbE PCI Express adapters"
+available-for:
+  apollolake-4.4.180:
+    install-script: &script "install.sh"
+    modules: true
+  geminilake-4.4.180:
+    install-script: *script
+    modules: true

files/configs/arpl_defconfig

@@ -60,4 +60,5 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
-
+BR2_PACKAGE_R8125=y
+BR2_PACKAGE_R8168=y

img-gen.sh

@@ -21,13 +21,13 @@ unzip /tmp/rp-lkms.zip -d files/board/arpl/p3/lkms
 
 # Get latest addons and install its
 echo "Getting latest Addons"
+mkdir -p /tmp/addons
 if [ -d ../arpl-addons ]; then
   cp ../arpl-addons/*.addon /tmp/addons/
 else
   TAG=`curl -s https://api.github.com/repos/fbelavenuto/arpl-addons/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
   curl -L "https://github.com/fbelavenuto/arpl-addons/releases/download/${TAG}/addons.zip" -o /tmp/addons.zip
   rm -rf /tmp/addons
-  mkdir -p /tmp/addons
   unzip /tmp/addons.zip -d /tmp/addons
 fi
 DEST_PATH="files/board/arpl/p3/addons"
@@ -41,16 +41,19 @@ done
 
 # Copy files
 echo "Copying files"
-cp -Ru files/* .buildroot/
 VERSION=`cat VERSION`
 sed 's/^ARPL_VERSION=.*/ARPL_VERSION="'${VERSION}'"/' -i files/board/arpl/overlayfs/opt/arpl/include/consts.sh
+cp -Ru files/* .buildroot/
 
 cd .buildroot
 echo "Generating default config"
 make arpl_defconfig
 echo "Version: ${VERSION}"
 echo "Building... Drink a coffee and wait!"
-make
+make BR2_EXTERNAL=../external
 cd -
 rm -f *.zip
 zip -9 "arpl-${VERSION}.img.zip" arpl.img
+qemu-img convert -O vmdk arpl.img arpl.vmdk
+zip -9 "arpl-${VERSION}.vmdk.zip" arpl.vmdk
+[ -x test.sh ] && ./test.sh