Merge pull request #66 from fbelavenuto/dev

Addons misc and acpid installed by default

README.md

@@ -6,11 +6,15 @@ It is still in alpha stage, with little documentation, but it is functional. I'm
 
 I tried to make the system as user-friendly as possible, to make life easier. The loader automatically detects which device is being used, SATADom or USB, detecting its VID and PID correctly. redpill-lkm has been edited to allow booting the kernel without setting the variables related to network interfaces so the loader (and user) doesn't have to worry about that. The Jun's code that makes the zImage and Ramdisk patch is embedded, if there is a change in "zImage" or "rd.gz" by some update, the loader re-applies the patches. Builds 42218 and 42661 up to update5 are working. Automatic updates should still be disabled as we are not sure if this technique will work forever. The most important kernel modules are built into the DSM ramdisk image for automatic peripheral detection.
 
+# Use
+
 To use this project, download the latest image available and burn it to a USB stick or SATA disk-on-module. Set the PC to boot from the burned media and follow the informations on the screen. When booting, the user can call the "menu.sh" command from the computer itself, access via SSH or use the virtual terminal (ttyd) by typing the address provided on the screen (http://(ip):7681). The loader will automatically increase the size of the last partition and use this space as cache if it is larger than 2GiB.
 
+### It is highly recommended to use an SSD for the loader in the case of the option via DoM or a fast USB flash drive
+
 The menu system is dynamic and I hope it is intuitive enough that the user can use it without any problems. Its allows you to choose a model, the existing buildnumber for the chosen model, type or randomly create a serial number, add/remove addons, add/remove/view "cmdline" and "synoinfo" entries, choose the LKM version, create the loader, boot, manually edit the configuration file, choose a keymap, update and exit.
 
-Changing addons and synoinfo entries require re-creating the loader, cmdline entries do not. You can view the "cmdline" and "synoinfo" entries defined for the chosen model, with user-defined entries having higher priority.
+Changing addons and synoinfo entries require re-creating the loader, cmdline entries do not.
 
 There is no need to configure the VID/PID (if using a USB stick) or define the MAC Addresses of the network interfaces. If the user wants to modify the MAC Address of any interface, he must manually add "cmdline" entries in the corresponding menu (set "netif_num" according to "mac1..4" entries).
 
@@ -20,7 +24,8 @@ Another important point is that the loader detects whether or not the CPU has th
 
 I developed a simple patch to no longer display the DUMMY port error on models without device-tree, the user will be able to install without having to worry about it.
 
+# Thanks
+
 All code was based on the work of TTG, pocopico, jumkey and others involved in continuing TTG's original redpill-load project.
 
 More information will be added in the future.
-

TODO

@@ -24,5 +24,7 @@ Concluidos:
  - Melhorar opções de HD, talvez criar um menu a parte
  - Implementar update do bzimage e ramdisk online
  - Mudar addons para colocar pacote completo na partição 3 e detectar dinâmicamente durante o boot do júnior
-
-https://kb.synology.com/en-me/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have
+ - Acertar flag DIRTY ao atualizar módulos, etc
+ - Consertar MAC custom
+ - Mudar synoinfo para ler do modelo e preencher no user_config, para usuário poder deletar entradas do modelo
+ - Validar netif_num e macX

Taskfile.yaml

@@ -12,15 +12,6 @@ tasks:
     cmds:
       - ./build.sh
 
-  compile-lkms:
-    cmds:
-      - ./compile-lkm.sh
-
-  compile-addons:
-    dir: addons
-    cmds:
-      - ./compile-addons.sh {{.CLI_ARGS}}
-
   compile-kpatch:
     dir: kpatch
     cmds:

VERSION

@@ -1 +1 @@
-0.3-alpha3
+0.3-alpha7

docker/Dockerfile.template

@@ -3,20 +3,17 @@ ARG PLATFORMS="@@@PLATFORMS@@@"
 ARG TOOLKIT_VER="@@@TOOLKIT_VER@@@"
 
 # Copy downloaded toolkits
-ADD cache /cache
+ADD cache/$TOOLKIT_VER /cache
 # Extract toolkits
 RUN for V in ${PLATFORMS}; do \
       echo "${V}" | while IFS=':' read PLATFORM KVER; do \
+        echo -e "${PLATFORM}\t${KVER}" >> /opt/platforms && \
         echo "Extracting ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" && \
         mkdir "/opt/${PLATFORM}" && \
-        tar -xaf "/cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" -C "/opt/${PLATFORM}" --strip-components=10 \
-          "usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-${TOOLKIT_VER}/build" && \
-        echo -e "${PLATFORM}\t${KVER}" >> /opt/platforms && \
-        if [ ! -d "/opt/linux-${KVER}" ]; then \
-          mkdir "/opt/linux-${KVER}" && \
-          echo "Extracting linux-${KVER}.tar.xz" && \
-          tar -xaf "/cache/linux-${KVER}.tar.xz" -C "/opt/linux-${KVER}" --strip-components=1; \
-        fi; \
+        tar -xaf "/cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" -C "/opt/${PLATFORM}" --strip-components=9 \
+          "usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-${TOOLKIT_VER}" && \
+        echo "Extracting ${PLATFORM}-toolchain.txz" && \
+        tar -xaf "/cache/${PLATFORM}-toolchain.txz" -C "/opt/${PLATFORM}" --strip-components=1; \
       done; \
     done
 

docker/build.sh

@@ -6,50 +6,75 @@ function trap_cancel() {
     sleep 2 || exit 1
 }
 trap trap_cancel SIGINT SIGTERM
-
 cd `dirname $0`
 
-# Read platforms/kerver version
-echo "Reading platforms"
-declare -A PLATFORMS
-while read PLATFORM KVER; do
-  PLATFORMS[${PLATFORM}]="${KVER}"
-done <../PLATFORMS
+###############################################################################
+function prepare() {
+  declare -A URLS
 
-# Download toolkits
-mkdir -p cache
+  URLS["apollolake"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28Apollolake%29/apollolake-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["broadwell"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28Broadwell%29/broadwell-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["broadwellnk"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28Broadwellnk%29/broadwellnk-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["bromolow"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20linux%203.10.108%20%28Bromolow%29/bromolow-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["denverton"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28Denverton%29/denverton-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["geminilake"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28GeminiLake%29/geminilake-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["v1000"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28V1000%29/v1000-${GCCLIB_VER}_x86_64-GPL.txz"
+
+  # Read platforms/kerver version
+  echo "Reading platforms"
+  declare -A PLATFORMS
+  while read PLATFORM KVER; do
+    PLATFORMS[${PLATFORM}]="${KVER}"
+  done <../PLATFORMS
+
+  # Download toolkits
+  mkdir -p cache
+
+  for PLATFORM in ${!PLATFORMS[@]}; do
+    KVER="${PLATFORMS[${PLATFORM}]}"
+    echo -n "Checking cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
+    if [ ! -f "cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then
+      URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+      echo "Downloading ${URL}"
+      curl -L "${URL}" -o "cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+    else
+      echo "OK"
+    fi
+    echo -n "Checking cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz... "
+    if [ ! -f "cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz" ]; then
+      URL=${URLS["${PLATFORM}"]}
+      echo "Downloading ${URL}"
+      curl -L "${URL}" -o "cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz"
+    else
+      echo "OK"
+    fi
+  done
+
+  # Generate Dockerfile
+  echo "Generating Dockerfile"
+  cp Dockerfile.template Dockerfile
+  VALUE=""
+  for PLATFORM in ${!PLATFORMS[@]}; do
+    VALUE+="${PLATFORM}:${PLATFORMS[${PLATFORM}]} "
+  done
+  sed -i "s|@@@PLATFORMS@@@|${VALUE::-1}|g" Dockerfile
+  sed -i "s|@@@TOOLKIT_VER@@@|${TOOLKIT_VER}|g" Dockerfile
+}
+
+# 7.0
 TOOLKIT_VER="7.0"
-for PLATFORM in ${!PLATFORMS[@]}; do
-  KVER="${PLATFORMS[${PLATFORM}]}"
-  echo -n "Checking cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
-  if [ ! -f "cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then
-    URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
-    echo "Downloading ${URL}"
-    curl -L "${URL}" -o "cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
-  else
-    echo "OK"
-  fi
-  # echo -n "Checking cache/linux-${KVER}.tar.xz... "
-  # if [ ! -f "cache/linux-${KVER}.tar.xz" ]; then
-  #   URL="https://cdn.kernel.org/pub/linux/kernel/v${KVER:0:1}.x/linux-${KVER}.tar.xz"
-  #   echo "Downloading ${URL}"
-  #   curl -L "${URL}" -o "cache/linux-${KVER}.tar.xz"
-  # else
-  #   echo "OK"
-  # fi
-done
+TOOLCHAIN_VER="7.0-41890"
+GCCLIB_VER="gcc750_glibc226"
+prepare
+echo "Building ${TOOLKIT_VER}"
+docker image rm fbelavenuto/syno-compiler:${TOOLKIT_VER} >/dev/null 2>&1
+docker buildx build . --load --tag fbelavenuto/syno-compiler:${TOOLKIT_VER}
 
-# Generate Dockerfile
-echo "Generating Dockerfile"
-cp Dockerfile.template Dockerfile
-VALUE=""
-for PLATFORM in ${!PLATFORMS[@]}; do
-  VALUE+="${PLATFORM}:${PLATFORMS[${PLATFORM}]} "
-done
-sed -i "s|@@@PLATFORMS@@@|${VALUE::-1}|g" Dockerfile
-sed -i "s|@@@TOOLKIT_VER@@@|${TOOLKIT_VER}|g" Dockerfile
-
-# Build
-echo "Building... Drink a coffee and wait!"
-docker image rm fbelavenuto/syno-compiler >/dev/null 2>&1
-docker buildx build . --load --tag fbelavenuto/syno-compiler
+# 7.1
+TOOLKIT_VER="7.1"
+TOOLCHAIN_VER="7.1-42661"
+GCCLIB_VER="gcc850_glibc226"
+prepare
+echo "Building ${TOOLKIT_VER}"
+docker image rm fbelavenuto/syno-compiler:${TOOLKIT_VER} >/dev/null 2>&1
+docker buildx build . --load --tag fbelavenuto/syno-compiler:${TOOLKIT_VER} --tag fbelavenuto/syno-compiler:latest

docker/files/opt/do.sh

@@ -1,5 +1,20 @@
 #!/usr/bin/env bash
 
+set -e
+
+function export-vars {
+  # Validate
+  if [ -z "${1}" ]; then
+    echo "Use: export-vars <platform>"
+    exit 1
+  fi
+  export CROSS_COMPILE="/opt/${1}/bin/x86_64-pc-linux-gnu-"
+  export CFLAGS="-I/opt/${1}/include"
+  export LDFLAGS="-I/opt/${1}/lib"
+  export LD_LIBRARY_PATH="/opt/${1}/lib"
+  export ARCH=x86_64
+}
+
 function compile-module {
   # Validate
   if [ -z "${1}" ]; then
@@ -19,7 +34,9 @@ function compile-module {
   fi
   echo "Compiling module for ${PLATFORM}-${KVER}..."
   cp -R /input /tmp
-  make -C "/opt/${PLATFORM}" M="/tmp/input" PLATFORM=${PLATFORM^^} modules
+  export-vars ${PLATFORM}
+  make -C "/opt/${PLATFORM}/build" M="/tmp/input" \
+       ${PLATFORM^^}-Y=y ${PLATFORM^^}-M=m modules
   while read F; do
     strip -g "${F}"
     echo "Copying `basename ${F}`"
@@ -34,11 +51,13 @@ function compile-lkm {
     exit 1
   fi
   cp -R /input /tmp
-  make -C "/tmp/input" LINUX_SRC="/opt/${PLATFORM}" dev-v7
+  export-vars ${PLATFORM}
+  export LINUX_SRC="/opt/${PLATFORM}/build"
+  make -C "/tmp/input" dev-v7
   strip -g "/tmp/input/redpill.ko"
   mv "/tmp/input/redpill.ko" "/output/redpill-dev.ko"
-  make -C "/tmp/input" LINUX_SRC="/opt/${PLATFORM}" clean
-  make -C "/tmp/input" LINUX_SRC="/opt/${PLATFORM}" prod-v7
+  make -C "/tmp/input" clean
+  make -C "/tmp/input" prod-v7
   strip -g "/tmp/input/redpill.ko"
   mv "/tmp/input/redpill.ko" "/output/redpill-prod.ko"
 }
@@ -71,10 +90,10 @@ if [ $# -lt 1 ]; then
   exit 1
 fi
 case $1 in
-  bash) shift; bash -l $@ ;;
+  bash) shift && bash -l $@ ;;
+  shell) export-vars $2 && shift 2 && bash -l $@ ;;
   compile-module) compile-module $2 ;;
   compile-lkm) compile-lkm $2 ;;
   # compile-drivers) compile-drivers ;;
   *) echo "Command not recognized: $1" ;;
 esac
-

files/board/arpl/kernel_defconfig

@@ -121,6 +121,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_SAS_ATA=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
 CONFIG_SCSI_3W_9XXX=m
@@ -184,9 +185,31 @@ CONFIG_SATA_SIL=m
 CONFIG_SATA_SIS=m
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
+CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
 CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RDC=m
 CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
 CONFIG_ATA_GENERIC=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y

files/board/arpl/make-img.sh

@@ -19,7 +19,7 @@ dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=300 conv=sync 2>/dev/null
 # Copy grub stage1 to image
 dd if="${BOARD_PATH}/grub.bin" of="${IMAGE_FILE}" conv=notrunc,sync 2>/dev/null
 # Create partitions on image
-echo -e "n\np\n\n\n+150M\na\nt\n\n0b\nn\np\n\n\n+50M\nn\np\n\n\n\nw" | fdisk "${IMAGE_FILE}" >/dev/null
+echo -e "n\np\n\n\n+50M\na\nt\n\n0b\nn\np\n\n\n+50M\nn\np\n\n\n\nw" | fdisk "${IMAGE_FILE}" >/dev/null
 
 # Force umount, ignore errors
 sudo umount "${BINARIES_DIR}/p1" 2>/dev/null || true
@@ -40,8 +40,8 @@ sudo mount /dev/loop8p1 "${BINARIES_DIR}/p1"
 sudo mount /dev/loop8p3 "${BINARIES_DIR}/p3"
 
 echo "Copying files"
-sudo cp "${BINARIES_DIR}/bzImage"            "${BINARIES_DIR}/p1/bzImage-arpl"
-sudo cp "${BINARIES_DIR}/rootfs.cpio.xz"     "${BINARIES_DIR}/p1/initrd-arpl"
+sudo cp "${BINARIES_DIR}/bzImage"            "${BINARIES_DIR}/p3/bzImage-arpl"
+sudo cp "${BINARIES_DIR}/rootfs.cpio.xz"     "${BINARIES_DIR}/p3/initrd-arpl"
 sudo cp -R "${BOARD_PATH}/p1/"*              "${BINARIES_DIR}/p1"
 sudo cp -R "${BOARD_PATH}/p3/"*              "${BINARIES_DIR}/p3"
 sync

files/board/arpl/overlayfs/etc/init.d/S41dhcpcd

@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Start/stop dhcpcd
+#
+
+DAEMON=/usr/sbin/dhcpcd
+CONFIG=/etc/dhcpcd.conf
+PIDFILE=/var/run/dhcpcd/pid
+
+[ -f $CONFIG ] || exit 0
+
+case "$1" in
+  start)
+	echo "Starting dhcpcd..."
+	start-stop-daemon -S -x "$DAEMON" -p "$PIDFILE" -- -f "$CONFIG"
+	;;
+  stop)
+	echo "Stopping dhcpcd..."
+	start-stop-daemon -K -x "$DAEMON" -p "$PIDFILE" -o
+	;;
+  reload|force-reload)
+	echo "Reloading dhcpcd configuration..."
+	"$DAEMON" -s reload
+	;;
+  restart)
+	"$0" stop
+	sleep 1 # Prevent race condition: ensure dhcpcd stops before start.
+	"$0" start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}"
+	exit 1
+esac

files/board/arpl/overlayfs/etc/samba/smb.conf

@@ -0,0 +1,18 @@
+[global]
+  workgroup = WORKGROUP
+  server role = standalone server
+  obey pam restrictions = yes
+  map to guest = Bad User
+  usershare allow guests = yes
+[arpl]
+  browseable = yes
+  public = yes
+  path = /mnt
+  guest ok = yes
+  printable = no
+  read only = no
+  writable = yes
+  create mask = 0600
+  directory mask = 0700
+  force user = root
+  force group = root

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

@@ -48,6 +48,9 @@ MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
 BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
 SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
 
+echo -e "Model: \033[1;36m${MODEL}\033[0m"
+echo -e "Build: \033[1;36m${BUILD}\033[0m"
+
 declare -A CMDLINE
 
 # Fixed values
@@ -76,13 +79,26 @@ 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`
 if [ "${BUS}" = "ata" ]; then
-  SIZE=$((`df -BM | awk '/\/mnt\/p3/{print$2}' | tr 'M' ' '`+300))
+  LOADER_DEVICE_NAME=`echo ${LOADER_DISK} | sed 's|/dev/||'`
+  SIZE=$((`cat /sys/block/${LOADER_DEVICE_NAME}/size`/2048+10))
   # Read SATADoM type
   DOM="`readModelKey "${MODEL}" "dom"`"
 fi
 
+# Validate netif_num
+NETIF_NUM=${CMDLINE["netif_num"]}
+MACS=0
+for N in `seq 1 4`; do
+  [ -n "${CMDLINE["mac${N}"]}" ] && MACS=$((${MACS}+1))
+done
+if [ ${NETIF_NUM} -ne ${MACS} ]; then
+  echo -e "\033[1;33m*** netif_num is not equal to macX amount, set netif_num to ${MACS} ***\033[0m"
+  CMDLINE["netif_num"]=${MACS}
+fi
+
 # Prepare command line
 CMDLINE_LINE=""
+grep -q "force_junior" /proc/cmdline && CMDLINE_LINE+="force_junior "
 [ ${EFI} -eq 1 ] && CMDLINE_LINE+="withefi "
 [ "${BUS}" = "ata" ] && CMDLINE_LINE+="synoboot_satadom=${DOM} dom_szmax=${SIZE} "
 CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8250,io,0x3f8,115200n8 elevator=elevator root=/dev/md0 loglevel=15"
@@ -94,31 +110,29 @@ done
 # Escape special chars
 CMDLINE_LINE=`echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g'`
 
-# Inform user
-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: "
+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"
+    echo -e ": \033[1;32m${IP}\033[0m"
     break
   elif [ ${COUNT} -eq 15 ]; then
-    echo -e "\033[1;31mERROR\033[0m"
+    echo -e ": \033[1;31mERROR\033[0m"
     break
   fi
   COUNT=$((${COUNT}+1))
   sleep 1
+  echo -n "."
 done
 
 echo -e "\033[1;37mLoading DSM kernel...\033[0m"
 
 # Executes DSM kernel via KEXEC
-history -a
+history -w
 sync
 if [ "${EFI_BUG}" = "yes" -a ${EFI} -eq 1 ]; then
   echo -e "\033[1;33mWarning, running kexec with --noefi param, strange things will happen!!\033[0m"

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

@@ -1,5 +1,5 @@
 
-ARPL_VERSION="0.3-alpha3"
+ARPL_VERSION="0.3-alpha7"
 
 # Define paths
 TMP_PATH="/tmp"
@@ -8,12 +8,14 @@ RAMDISK_PATH="${TMP_PATH}/ramdisk"
 LOG_FILE="${TMP_PATH}/log.txt"
 
 USER_CONFIG_FILE="${BOOTLOADER_PATH}/user-config.yml"
-MOD_ZIMAGE_FILE="${BOOTLOADER_PATH}/zImage"
-MOD_RDGZ_FILE="${BOOTLOADER_PATH}/rd.gz"
 
 ORI_ZIMAGE_FILE="${SLPART_PATH}/zImage"
 ORI_RDGZ_FILE="${SLPART_PATH}/rd.gz"
 
+ARPL_BZIMAGE_FILE="${CACHE_PATH}/bzImage-arpl"
+ARPL_RAMDISK_FILE="${CACHE_PATH}/initrd-arpl"
+MOD_ZIMAGE_FILE="${CACHE_PATH}/zImage-dsm"
+MOD_RDGZ_FILE="${CACHE_PATH}/initrd-dsm"
 ADDONS_PATH="${CACHE_PATH}/addons"
 LKM_PATH="${CACHE_PATH}/lkms"
 MODULES_PATH="${CACHE_PATH}/modules"

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

@@ -34,7 +34,6 @@ mount ${LOADER_DISK}1 ${BOOTLOADER_PATH} || die "Can't mount ${BOOTLOADER_PATH}"
 mount ${LOADER_DISK}2 ${SLPART_PATH}     || die "Can't mount ${SLPART_PATH}"
 mount ${LOADER_DISK}3 ${CACHE_PATH}      || die "Can't mount ${CACHE_PATH}"
 
-mkdir -p "${ADDONS_PATH}"
 # Move/link SSH machine keys to/from cache volume
 [ ! -d "${CACHE_PATH}/ssh" ] && cp -R "/etc/ssh" "${CACHE_PATH}/ssh"
 rm -rf "/etc/ssh"
@@ -57,6 +56,16 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
   writeConfigKey "cmdline" "{}" "${USER_CONFIG_FILE}"
   writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
   writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
+  writeConfigKey "addons.misc" "" "${USER_CONFIG_FILE}"
+  writeConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
+fi
+
+# Set custom MAC if defined
+MAC1=`readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"`
+if [ -n "${MAC1}" ]; then
+  MAC="${MAC1:0:2}:${MAC1:2:2}:${MAC1:4:2}:${MAC1:6:2}:${MAC1:8:2}:${MAC1:10:2}"
+  ip link set dev eth0 address ${MAC} >/dev/null 2>&1 && \
+    (/etc/init.d/S41dhcpcd restart >/dev/null 2>&1 &) || true
 fi
 
 # Get the VID/PID if we are in USB
@@ -148,3 +157,7 @@ echo
 echo -e "User config is on \033[1;32m${USER_CONFIG_FILE}\033[0m"
 echo -e "Default SSH Root password is \033[1;31mRedp1lL-1s-4weSomE\033[0m"
 echo
+
+mkdir -p "${ADDONS_PATH}"
+mkdir -p "${LKM_PATH}"
+mkdir -p "${MODULES_PATH}"

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

@@ -58,38 +58,53 @@ function backtitle() {
 ###############################################################################
 # Shows available models to user choose one
 function modelMenu() {
-  ITEMS=""
-  while read M; do
-    M="`basename ${M}`"
-    M="${M::-4}"
-    PLATFORM=`readModelKey "${M}" "platform"`
-    # Check id model is compatible with CPU
-    COMPATIBLE=1
-    for F in `readModelArray "${M}" "flags"`; do
-      if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
-        COMPATIBLE=0
-        break
+  RESTRICT=1
+  while true; do
+    echo "" > "${TMP_PATH}/menu"
+    FLGNEX=0
+    while read M; do
+      M="`basename ${M}`"
+      M="${M::-4}"
+      PLATFORM=`readModelKey "${M}" "platform"`
+      DT="`readModelKey "${M}" "dt"`"
+      # Check id model is compatible with CPU
+      COMPATIBLE=1
+      if [ ${RESTRICT} -eq 1 ]; then
+        for F in `readModelArray "${M}" "flags"`; do
+          if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
+            COMPATIBLE=0
+            FLGNEX=1
+            break
+          fi
+        done
       fi
-    done
-    [ ${COMPATIBLE} -eq 1 ] && ITEMS+="${M} ${PLATFORM} "
-  done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
-  dialog --backtitle "`backtitle`" --menu "Choose the model" 0 0 0 \
-    ${ITEMS} 2>${TMP_PATH}/resp
-  [ $? -ne 0 ] && return
-  resp=$(<${TMP_PATH}/resp)
-  [ -z "${resp}" ] && return
-  # If user change model, clean buildnumber and S/N
-  if [ "${MODEL}" != "${resp}" ]; then
-    MODEL=${resp}
-    writeConfigKey "model" "${MODEL}" "${USER_CONFIG_FILE}"
-    BUILD=""
-    writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}"
-    SN=""
-    writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
-    # Delete old files
-    rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
-    DIRTY=1
-  fi
+      [ "${DT}" = "true" ] && DT="-DT" || DT=""
+      [ ${COMPATIBLE} -eq 1 ] && echo "${M} \"\Zb${PLATFORM}${DT}\Zn\" " >> "${TMP_PATH}/menu"
+    done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
+    [ ${FLGNEX} -eq 1 ] && echo "f \"\Z1Disable flags restriction\Zn\"" >> "${TMP_PATH}/menu"
+    dialog --backtitle "`backtitle`" --colors --menu "Choose the model" 0 0 0 \
+      --file "${TMP_PATH}/menu" 2>${TMP_PATH}/resp
+    [ $? -ne 0 ] && return
+    resp=$(<${TMP_PATH}/resp)
+    [ -z "${resp}" ] && return
+    if [ "${resp}" = "f" ]; then
+      RESTRICT=0
+      continue
+    fi
+    # If user change model, clean buildnumber and S/N
+    if [ "${MODEL}" != "${resp}" ]; then
+      MODEL=${resp}
+      writeConfigKey "model" "${MODEL}" "${USER_CONFIG_FILE}"
+      BUILD=""
+      writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}"
+      SN=""
+      writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
+      # Delete old files
+      rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
+      DIRTY=1
+    fi
+    break
+  done
 }
 
 ###############################################################################
@@ -104,9 +119,23 @@ function buildMenu() {
   if [ "${BUILD}" != "${resp}" ]; then
     BUILD=${resp}
     writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}"
-    DIRTY=1
+    # Delete synoinfo and reload model/build synoinfo
+    writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
+    while IFS="=" read KEY VALUE; do
+      writeConfigKey "synoinfo.${KEY}" "${VALUE}" "${USER_CONFIG_FILE}"
+    done < <(readModelMap "${MODEL}" "builds.${BUILD}.synoinfo")
+    # Check addons
+    PLATFORM="`readModelKey "${MODEL}" "platform"`"
+    KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`"
+    while IFS="=" read ADDON PARAM; do
+      [ -z "${ADDON}" ] && continue
+      if ! checkAddonExist "${ADDON}" "${PLATFORM}" "${KVER}"; then
+        deleteConfigKey "addons.${ADDON}" "${USER_CONFIG_FILE}"
+      fi
+    done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
     # Remove old files
     rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
+    DIRTY=1
   fi
 }
 
@@ -168,6 +197,7 @@ function addonMenu() {
       d "Delete addon(s)" \
       s "Show user addons" \
       m "Show all available addons" \
+      o "Download a external addon" \
       e "Exit" \
       2>${TMP_PATH}/resp
     [ $? -ne 0 ] && return
@@ -238,6 +268,30 @@ function addonMenu() {
         dialog --backtitle "`backtitle`" --title "Available addons" \
           --colors --msgbox "${MSG}" 0 0
         ;;
+      o)
+        TEXT="please enter the complete URL to download.\n"
+        dialog --backtitle "`backtitle`" --aspect 18 --colors --inputbox "${TEXT}" 0 0 \
+          2>${TMP_PATH}/resp
+        [ $? -ne 0 ] && continue
+        URL="`<"${TMP_PATH}/resp"`"
+        [ -z "${URL}" ] && continue
+        clear
+        echo "Downloading ${URL}"
+        curl --insecure -L "${URL}" -o "${TMP_PATH}/addon.tgz" --progress-bar
+        if [ $? -ne 0 ]; then
+          dialog --backtitle "`backtitle`" --title "Error downloading" --aspect 18 \
+            --msgbox "Check internet, URL or cache disk space" 0 0
+          return 1
+        fi
+        ADDON="`untarAddon "${TMP_PATH}/addon.tgz"`"
+        if [ -n "${ADDON}" ]; then
+          dialog --backtitle "`backtitle`" --title "Success" --aspect 18 \
+            --msgbox "Addon '${ADDON}' added to loader" 0 0
+        else
+          dialog --backtitle "`backtitle`" --title "Invalid addon" --aspect 18 \
+            --msgbox "File format not recognized!" 0 0
+        fi
+        ;;
       e) return ;;
     esac
   done
@@ -285,7 +339,7 @@ function cmdlineMenu() {
         fi
         ITEMS=""
         for I in "${!CMDLINE[@]}"; do
-          ITEMS+="${I} ${CMDLINE[${I}]} off "
+          [ -z "${CMDLINE[${I}]}" ] && ITEMS+="${I} \"\" off " || ITEMS+="${I} ${CMDLINE[${I}]} off "
         done
         dialog --backtitle "`backtitle`" \
           --checklist "Select cmdline to remove" 0 0 0 ${ITEMS} \
@@ -315,6 +369,11 @@ function cmdlineMenu() {
           writeConfigKey "cmdline.mac1"      "${MAC1}" "${USER_CONFIG_FILE}"
           writeConfigKey "cmdline.netif_num" "1"       "${USER_CONFIG_FILE}"
         fi
+        /etc/init.d/S30arpl-mac restart 2>&1 | dialog --backtitle "`backtitle`" \
+          --title "User cmdline" --progressbox "Changing mac" 20 70
+        /etc/init.d/S41dhcpcd restart 2>&1 | dialog --backtitle "`backtitle`" \
+          --title "User cmdline" --progressbox "Renewing IP" 20 70
+        IP=`ip route get 1.1.1.1 2>/dev/null | awk '{print$7}'`
         ;;
       s)
         ITEMS=""
@@ -381,8 +440,7 @@ function synoinfoMenu() {
   if [ "${DT}" != "true" ]; then
     echo "x \"Set maxdisks manually\""    >> "${TMP_PATH}/menu"
   fi
-  echo "s \"Show user synoinfo\""         >> "${TMP_PATH}/menu"
-  echo "m \"Show model/build synoinfo\""  >> "${TMP_PATH}/menu"
+  echo "s \"Show synoinfo entries\""      >> "${TMP_PATH}/menu"
   echo "e \"Exit\""                       >> "${TMP_PATH}/menu"
 
   # menu loop
@@ -392,13 +450,14 @@ function synoinfoMenu() {
     [ $? -ne 0 ] && return
     case "`<${TMP_PATH}/resp`" in
       a)
-        dialog --backtitle "`backtitle`" --title "User synoinfo" \
-          --inputbox "Type a name of synoinfo variable" 0 0 \
+        dialog --backtitle "`backtitle`" --title "Synoinfo entries" \
+          --inputbox "Type a name of synoinfo entry" 0 0 \
           2>${TMP_PATH}/resp
         [ $? -ne 0 ] && continue
-        NAME="`sed 's/://g' <"${TMP_PATH}/resp"`"
-        dialog --backtitle "`backtitle`" --title "User synoinfo" \
-          --inputbox "Type a value of '${NAME}' variable" 0 0 "${SYNOINFO[${NAME}]}" \
+        NAME="`<"${TMP_PATH}/resp"`"
+        [ -z "${NAME}" ] && continue
+        dialog --backtitle "`backtitle`" --title "Synoinfo entries" \
+          --inputbox "Type a value of '${NAME}' entry" 0 0 "${SYNOINFO[${NAME}]}" \
           2>${TMP_PATH}/resp
         [ $? -ne 0 ] && continue
         VALUE="`<"${TMP_PATH}/resp"`"
@@ -408,15 +467,15 @@ function synoinfoMenu() {
         ;;
       d)
         if [ ${#SYNOINFO[@]} -eq 0 ]; then
-          dialog --backtitle "`backtitle`" --msgbox "No user synoinfo to remove" 0 0 
+          dialog --backtitle "`backtitle`" --msgbox "No synoinfo entries to remove" 0 0 
           continue
         fi
         ITEMS=""
         for I in "${!SYNOINFO[@]}"; do
-          ITEMS+="${I} ${SYNOINFO[${I}]} off "
+          [ -z "${SYNOINFO[${I}]}" ] && ITEMS+="${I} \"\" off " || ITEMS+="${I} ${SYNOINFO[${I}]} off "
         done
         dialog --backtitle "`backtitle`" \
-          --checklist "Select synoinfo to remove" 0 0 0 ${ITEMS} \
+          --checklist "Select synoinfo entry to remove" 0 0 0 ${ITEMS} \
           2>"${TMP_PATH}/resp"
         [ $? -ne 0 ] && continue
         RESP=`<"${TMP_PATH}/resp"`
@@ -441,15 +500,7 @@ function synoinfoMenu() {
         for KEY in ${!SYNOINFO[@]}; do
           ITEMS+="${KEY}: ${SYNOINFO[$KEY]}\n"
         done
-        dialog --backtitle "`backtitle`" --title "User synoinfo" \
-          --aspect 18 --msgbox "${ITEMS}" 0 0
-        ;;
-      m)
-        ITEMS=""
-        while IFS="=" read KEY VALUE; do
-          ITEMS+="${KEY}: ${VALUE}\n"
-        done < <(readModelMap "${MODEL}" "builds.${BUILD}.synoinfo")
-        dialog --backtitle "`backtitle`" --title "Model/build synoinfo" \
+        dialog --backtitle "`backtitle`" --title "Synoinfo entries" \
           --aspect 18 --msgbox "${ITEMS}" 0 0
         ;;
       e) return ;;
@@ -744,8 +795,8 @@ function updateMenu() {
         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
+        mv /tmp/bzImage "${ARPL_BZIMAGE_FILE}"
+        mv /tmp/rootfs.cpio.xz "${ARPL_RAMDISK_FILE}"
         dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
           --yesno "Arpl updated with success to ${TAG}!\nReboot?" 0 0
         [ $? -ne 0 ] && continue
@@ -777,13 +828,13 @@ function updateMenu() {
         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
+          rm -rf "${ADDONS_PATH}/${ADDON}"
+          mkdir -p "${ADDONS_PATH}/${ADDON}"
+          tar xaf "${PKG}" -C "${ADDONS_PATH}/${ADDON}" >/dev/null 2>&1
         done
+        DIRTY=1
         dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
           --msgbox "Addons updated with success!" 0 0
         ;;
@@ -809,6 +860,7 @@ function updateMenu() {
           --infobox "Extracting last version" 0 0
         rm -rf "${LKM_PATH}/"*
         unzip /tmp/rp-lkms.zip -d "${LKM_PATH}" >/dev/null 2>&1
+        DIRTY=1
         dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
           --msgbox "LKMs updated with success!" 0 0
         ;;
@@ -845,6 +897,7 @@ function updateMenu() {
           rm "${MODULES_PATH}/${P}.tgz"
           mv "/tmp/${P}.tgz" "${MODULES_PATH}/${P}.tgz"
         done
+        DIRTY=1
         dialog --backtitle "`backtitle`" --title "Update Modules" --aspect 18 \
           --msgbox "Modules updated with success!" 0 0
         ;;

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

@@ -11,6 +11,8 @@ synoinfo: &synoinfo
   updateurl: "http://example.com/"
   myds_region_api_base_url: "https://example.com"
   security_version_server: "https://example.com/smallupdate"
+  supportraidgroup: "no"
+  supportssdcache: "no"
 cmdline: &cmdline
   SMBusHddDynamicPower: 1
   vender_format_version: 2
@@ -47,3 +49,21 @@ builds:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
       - "ramdisk-common-post-init-script.patch"
+  42661:
+    ver: "7.1.0"
+    kver: "4.4.180"
+    rd-compressed: false
+    efi-bug: no
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS2422%2B_42661.pat"
+      hash: "c38fee0470c592b679ab52a64eac76b2a3912fb2e6aba65a65abb5aa05a98d4c"
+      ramdisk-hash: "bb109132e96b1e26d5e3d44557944f7518168d8cb18e35d6254c0dfe7fb19382"
+      zimage-hash: "d939b5937be00a644aae64c33633619a7c310433e60a515c77bbef00b0a7e6b6"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-42661-post-init-script.patch"

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

@@ -7,6 +7,10 @@ synoinfo: &synoinfo
   small_info_path: "https://example.com/null"
   updateurl: "http://example.com/"
   myds_region_api_base_url: "https://example.com"
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
+  supportraidgroup: "no"
+  supportssdcache: "no"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0

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

@@ -11,6 +11,10 @@ synoinfo: &synoinfo
   updateurl: "http://example.com/"
   myds_region_api_base_url: "https://example.com"
   security_version_server: "https://example.com/smallupdate"
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
+  supportraidgroup: "no"
+  supportssdcache: "no"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0

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

@@ -44,10 +44,7 @@ RD_COMPRESSED="`readModelKey "${MODEL}" "builds.${BUILD}.rd-compressed"`"
 declare -A SYNOINFO
 declare -A ADDONS
 
-# Read more config
-while IFS="=" read KEY VALUE; do
-  [ -n "${KEY}" ] && SYNOINFO["${KEY}"]="${VALUE}"
-done < <(readModelMap "${MODEL}" "builds.${BUILD}.synoinfo")
+# Read synoinfo and addons from config
 while IFS="=" read KEY VALUE; do
   [ -n "${KEY}" ] &&  SYNOINFO["${KEY}"]="${VALUE}"
 done < <(readConfigMap "synoinfo" "${USER_CONFIG_FILE}")
@@ -92,32 +89,37 @@ for F in `ls "${TMP_PATH}/modules/"*.ko`; do
 #  [ -f "${RAMDISK_PATH}/usr/lib/modules/${M}" ] || mv "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}"
   cp "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}"
 done
+mkdir -p "${RAMDISK_PATH}/usr/lib/firmware"
+gzip -dc "${CACHE_PATH}/modules/firmware.tgz" | tar xf - -C "${RAMDISK_PATH}/usr/lib/firmware"
 # Clean
 rm -rf "${TMP_PATH}/modules"
 
-# Build modules dependencies
-/opt/arpl/depmod -a -b ${RAMDISK_PATH} 2>/dev/null
-
 echo -n "."
 # Copying fake modprobe
 cp "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe"
 # Copying LKM to /usr/lib/modules
-cp "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko" "${RAMDISK_PATH}/usr/lib/modules/rp.ko"
+gzip -dc "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko.gz" > "${RAMDISK_PATH}/usr/lib/modules/rp.ko"
 
 # Addons
 MAXDISKS=`readConfigKey "maxdisks" "${USER_CONFIG_FILE}"`
 # Check if model needs Device-tree dynamic patch
 DT="`readModelKey "${MODEL}" "dt"`"
-# Add system addon "dtbpatch" or "maxdisks"
-[ "${DT}" = "true" ] && ADDONS['dtbpatch']="" || ADDONS['maxdisks']="${MAXDISKS}"
-# Indispensable eudev system addon
-ADDONS['eudev']=""
 
 echo -n "."
 mkdir -p "${RAMDISK_PATH}/addons"
 echo "#!/bin/sh" > "${RAMDISK_PATH}/addons/addons.sh"
-echo 'export INSMOD="/sbin/insmod"' >> "${RAMDISK_PATH}/addons/addons.sh"
 echo 'echo "addons.sh called with params ${@}"' >> "${RAMDISK_PATH}/addons/addons.sh"
+# Required eudev and dtbpatch/maxdisks
+installAddon eudev
+echo "/addons/eudev.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
+if [ "${DT}" = "true" ]; then
+  installAddon dtbpatch
+  echo "/addons/dtbpatch.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
+else
+  installAddon maxdisks
+  echo "/addons/maxdisks.sh \${1} ${MAXDISKS}" >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
+fi
+# User addons
 for ADDON in ${!ADDONS[@]}; do
   PARAMS=${ADDONS[${ADDON}]}
   if ! installAddon ${ADDON}; then
@@ -128,6 +130,9 @@ for ADDON in ${!ADDONS[@]}; do
 done
 chmod +x "${RAMDISK_PATH}/addons/addons.sh"
 
+# Build modules dependencies
+/opt/arpl/depmod -a -b ${RAMDISK_PATH} 2>/dev/null
+
 # Reassembly ramdisk
 echo -n "."
 if [ "${RD_COMPRESSED}" == "true" ]; then

files/board/arpl/p1/grub/grub.cfg

@@ -6,7 +6,7 @@ terminal_input console
 terminal_output console
 
 set default="0"
-set timeout="3"
+set timeout="5"
 set timeout_style="menu"
 
 insmod loadenv
@@ -51,8 +51,8 @@ if serial --unit=0 --speed=115200; then
 fi
 
 insmod search
-search --set=root --label "ARPL1"
-if [ -s /zImage -a -s /rd.gz ]; then
+search --set=root --label "ARPL3"
+if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
   menuentry 'Boot DSM' --id boot {
     echo "Loading kernel..."
     linux /bzImage-arpl console=ttyS0,115200n8 quiet
@@ -60,6 +60,13 @@ if [ -s /zImage -a -s /rd.gz ]; then
     initrd /initrd-arpl
     echo "Booting..."
   }
+  menuentry 'Force re-install DSM' --id junior {
+    echo "Loading kernel..."
+    linux /bzImage-arpl console=ttyS0,115200n8 quiet force_junior
+    echo "Loading initramfs..."
+    initrd /initrd-arpl
+    echo "Booting..."
+  }
 else
   set timeout="1"
 fi

files/board/arpl/p3/addons/9p/manifest.yml

@@ -0,0 +1,25 @@
+version: 1
+name: 9p
+description: "Driver for virtio 9p"
+available-for:
+  bromolow-3.10.108:
+    install-script: &script "install.sh"
+    copy: "bromolow-3.10.108"
+  apollolake-4.4.180:
+    install-script: *script
+    copy: "apollolake-4.4.180"
+  broadwell-4.4.180:
+    install-script: *script
+    copy: "broadwell-4.4.180"
+  broadwellnk-4.4.180:
+    install-script: *script
+    copy: "broadwellnk-4.4.180"
+  denverton-4.4.180:
+    install-script: *script
+    copy: "denverton-4.4.180"
+  geminilake-4.4.180:
+    install-script: *script
+    copy: "geminilake-4.4.180"
+  v1000-4.4.180:
+    install-script: *script
+    copy: "v1000-4.4.180"

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

@@ -0,0 +1,7 @@
+version: 1
+name: i915
+description: "Intel iGPU Drivers (10th Gen)"
+available-for:
+  geminilake-4.4.180:
+    install-script: "install.sh"
+    copy: "geminilake-4.4.180"

files/configs/arpl_defconfig

@@ -26,7 +26,6 @@ BR2_PACKAGE_BINUTILS_TARGET=y
 BR2_PACKAGE_CPIO=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_ACPID=y
 BR2_PACKAGE_KBD=y
@@ -37,15 +36,15 @@ BR2_PACKAGE_NVME=y
 BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_SMARTMONTOOLS=y
 BR2_PACKAGE_USBUTILS=y
-BR2_PACKAGE_PHP=y
-BR2_PACKAGE_PHP_SAPI_CLI=y
 BR2_PACKAGE_DTC=y
 BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_LIBCURL_CURL=y
+BR2_PACKAGE_PCRE2=y
 BR2_PACKAGE_DHCPCD=y
 BR2_PACKAGE_OPENSSH=y
 # BR2_PACKAGE_OPENSSH_CLIENT is not set
+BR2_PACKAGE_SAMBA4=y
 BR2_PACKAGE_BASH_COMPLETION=y
 BR2_PACKAGE_DIALOG=y
 BR2_PACKAGE_TTYD=y

img-gen.sh

@@ -49,6 +49,7 @@ if [ -d ../arpl-addons ]; then
     echo "${D}"
     (cd ${D} && tar caf "${MODULES_DIR}/${D}.tgz" *.ko)
   done
+  (cd firmware && tar caf "${MODULES_DIR}/firmware.tgz" *)
   cd -
 else
   TAG=`curl -s https://api.github.com/repos/fbelavenuto/arpl-modules/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
@@ -56,6 +57,7 @@ else
     FILE="${PLATFORM}-${KVER}"
     curl -L "https://github.com/fbelavenuto/arpl-modules/releases/download/${TAG}/${FILE}.tgz" -o "${MODULES_DIR}/${FILE}.tgz"
   done < PLATFORMS
+  curl -L "https://github.com/fbelavenuto/arpl-modules/releases/download/${TAG}/firmware.tgz" -o "${MODULES_DIR}/firmware.tgz"
 fi
 
 # Copy files
@@ -71,7 +73,8 @@ echo "Version: ${VERSION}"
 echo "Building... Drink a coffee and wait!"
 make BR2_EXTERNAL=../external
 cd -
-qemu-img convert -O vmdk arpl.img arpl.vmdk
+qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img arpl.vmdk
+#qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat arpl.vmdk
 [ -x test.sh ] && ./test.sh
 rm -f *.zip
 zip -9 "arpl-${VERSION}.img.zip" arpl.img