Merge pull request #16 from fbelavenuto/dev

merge dev

.github/workflows/main.yml

@@ -2,7 +2,12 @@ name: Build image
 
 # Controls when the workflow will run
 on:
-  
+
+  # Push only in dev  
+  push:
+    branches:
+      - dev
+
   # When a release is published
   release:
     types: [published]
@@ -25,16 +30,16 @@ jobs:
       # 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 missing buildroot dependency
+      # Install  dependencies
-      - name: Install dependency
+      - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libelf-dev
+          sudo apt-get install -y libelf-dev qemu-utils
 
       # Prepare buildroot for first make (for cache)
       - name: Prepare buildroot
@@ -92,18 +97,23 @@ jobs:
           echo "Building..."
           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
+          name: Images
-          path: arpl.img
+          path: |
+            arpl.img
+            arpl.vmdk
           retention-days: 1
 
       # Publish a release if is a tag
@@ -113,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

VERSION

@@ -1 +1 @@
-0.1-alpha6
+0.1-alpha7

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-alpha6"
+ARPL_VERSION="0.1-alpha7"
 
 # Define paths
 TMP_PATH="/tmp"

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

@@ -36,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

@@ -31,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

@@ -29,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

@@ -36,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

@@ -29,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

@@ -25,6 +25,7 @@ cmdline: &cmdline
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
 platform: "geminilake"
+dom: 2
 dt: true
 serial:
   prefix:

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

@@ -34,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

@@ -29,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

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

img-gen.sh

@@ -54,4 +54,6 @@ 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