Merge pull request #275 from fbelavenuto/first-beta

First beta release, with new update system

.github/workflows/main.yml

@@ -27,6 +27,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y libelf-dev qemu-utils
+          sudo cp -f files/board/arpl/overlayfs/usr/bin/yq /usr/bin/yq
 
       # Prepare buildroot for first make (for cache)
       - name: Prepare buildroot
@@ -47,7 +48,7 @@ jobs:
         id: build
         run: |
           VERSION=`<VERSION`
-          echo "::set-output name=VERSION::${VERSION}"
+          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
           # Remove old files
           rm -rf .buildroot/output/target/opt/arpl
           rm -rf .buildroot/board/arpl/overlayfs
@@ -84,7 +85,7 @@ jobs:
           echo "Building..."
           make BR2_EXTERNAL=../external
           cd -
-          #qemu-img convert -O vmdk arpl.img arpl.vmdk
+          qemu-img convert -O vmdk arpl.img arpl-dyn.vmdk
           qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat arpl.vmdk
 
       # Zip image and generate checksum
@@ -92,8 +93,13 @@ jobs:
         shell: bash
         run: |
           zip -9 "arpl-${{ steps.build.outputs.VERSION }}.img.zip" arpl.img
-          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk.zip" arpl*.vmdk
-          (cd .buildroot/output/images && sha256sum bzImage rootfs.cpio.xz) >> sha256sum
+          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk-dyn.zip" arpl-dyn.vmdk
+          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk
+          sha256sum update-list.yml > sha256sum
+          yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | while read F; do
+            (cd `dirname ${F}` && sha256sum `basename ${F}`) >> sha256sum
+          done
+          yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | xargs zip -9j "update.zip" sha256sum update-list.yml
 
       # Upload artifact
       - name: Upload
@@ -112,7 +118,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
-            sha256sum
+            arpl-${{ steps.build.outputs.VERSION }}.vmdk-dyn.zip
+            arpl-${{ steps.build.outputs.VERSION }}.vmdk-flat.zip
+            update.zip

TODO

@@ -1,8 +1,6 @@
 A fazer
  - Checar NVME no modelo DS920+, DS918+
- - J4125, HP G7 N40L desligando (#110 #160)
  - Checar módulo tg3 no próprio loader (BCM57780 [14e4:1692]) (#31)
- - Ver se vale a pena colocar uma opção para configurações extras, como escolher qual módulo realtek usar (R8168 ou R8169)
 
 Concluidos:
  - Generalizar código dos addons
@@ -35,3 +33,5 @@ Concluidos:
  - Adicionar mais binários para o addon dbgutils (nano, strace, etc)
  - Checar se tem como atualizar microcode via addon/modules/whatever... (NOP)
  - Estudar acrescentar modo simples e avançado do menu (NOP)
+ - J4125, HP G7 N40L desligando (#110 #160)
+ - Ver se vale a pena colocar uma opção para configurações extras, como escolher qual módulo realtek usar (R8168 ou R8169)

VERSION

@@ -1 +1 @@
-0.5-alpha1
+1.0-beta

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

@@ -18,6 +18,9 @@ printf "\033[1;44m%*s\033[0m\n" ${COLUMNS} ""
 TITLE="BOOTING..."
 printf "\033[1;33m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"
 
+history -w
+sync
+
 # Check if DSM zImage changed, patch it if necessary
 ZIMAGE_HASH="`readConfigKey "zimage-hash" "${USER_CONFIG_FILE}"`"
 if [ "`sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}'`" != "${ZIMAGE_HASH}" ]; then
@@ -110,7 +113,7 @@ for KEY in ${!CMDLINE[@]}; do
 done
 # Escape special chars
 CMDLINE_LINE=`echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g'`
-
+grub-editenv ${GRUB_PATH}/grubenv set dsm_cmdline="${CMDLINE_LINE}"
 echo -e "Cmdline:\n\033[1;36m${CMDLINE_LINE}\033[0m"
 
 # Wait for an IP
@@ -130,11 +133,17 @@ while true; do
   echo -n "."
 done
 
+DIRECT="`readConfigKey "directboot" "${USER_CONFIG_FILE}"`"
+if [ "${DIRECT}" = "true" ]; then
+  echo -e "\033[1;33mReboot to boot directly in DSM\033[0m"
+  grub-editenv ${GRUB_PATH}/grubenv set next_entry="direct"
+  reboot
+  sleep 100
+  exit
+fi
 echo -e "\033[1;37mLoading DSM kernel...\033[0m"
 
 # Executes DSM kernel via KEXEC
-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"
   kexec --noefi -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog

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

@@ -1,5 +1,5 @@
 
-ARPL_VERSION="0.5-alpha1"
+ARPL_VERSION="1.0-beta"
 
 # Define paths
 TMP_PATH="/tmp"
@@ -8,6 +8,7 @@ RAMDISK_PATH="${TMP_PATH}/ramdisk"
 LOG_FILE="${TMP_PATH}/log.txt"
 
 USER_CONFIG_FILE="${BOOTLOADER_PATH}/user-config.yml"
+GRUB_PATH="${BOOTLOADER_PATH}/grub"
 
 ORI_ZIMAGE_FILE="${SLPART_PATH}/zImage"
 ORI_RDGZ_FILE="${SLPART_PATH}/rd.gz"

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

@@ -69,6 +69,7 @@ MACF=`echo ${MAC} | sed 's/://g'`
 if [ ! -f "${USER_CONFIG_FILE}" ]; then
   touch "${USER_CONFIG_FILE}"
   writeConfigKey "lkm" "dev" "${USER_CONFIG_FILE}"
+  writeConfigKey "directboot" "false" "${USER_CONFIG_FILE}"
   writeConfigKey "model" "" "${USER_CONFIG_FILE}"
   writeConfigKey "build" "" "${USER_CONFIG_FILE}"
   writeConfigKey "sn" "" "${USER_CONFIG_FILE}"

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

@@ -23,6 +23,7 @@ BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
 LAYOUT="`readConfigKey "layout" "${USER_CONFIG_FILE}"`"
 KEYMAP="`readConfigKey "keymap" "${USER_CONFIG_FILE}"`"
 LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`"
+DIRECTBOOT="`readConfigKey "directboot" "${USER_CONFIG_FILE}"`"
 SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
 
 ###############################################################################
@@ -888,35 +889,37 @@ function updateMenu() {
         fi
         dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
           --infobox "Downloading last version ${TAG}" 0 0
-        # Download checksum
-        STATUS=`curl --insecure -s -w "%{http_code}" -L "https://github.com/fbelavenuto/arpl/releases/download/${TAG}/sha256sum" -o /tmp/sha256sum`
+        # Download update file
+        STATUS=`curl --insecure -s -w "%{http_code}" -L \
+          "https://github.com/fbelavenuto/arpl/releases/download/${TAG}/update.zip" -o /tmp/update.zip`
         if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
           dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
-            --msgbox "Error downloading checksums" 0 0
+            --msgbox "Error downloading update file" 0 0
           continue
         fi
-        STATUS=`curl --insecure -s -w "%{http_code}" -L "https://github.com/fbelavenuto/arpl/releases/download/${TAG}/bzImage" -o /tmp/bzImage`
-        if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
+        unzip -oq /tmp/update.zip -d /tmp
+        if [ $? -ne 0 ]; then
           dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
-            --msgbox "Error downloading bzImage" 0 0
+            --msgbox "Error extracting update file" 0 0
           continue
         fi
-        STATUS=`curl --insecure -s -w "%{http_code}" -L "https://github.com/fbelavenuto/arpl/releases/download/${TAG}/rootfs.cpio.xz" -o /tmp/rootfs.cpio.xz`
-        if [ $? -ne 0 -o ${STATUS} -ne 200 ]; 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
+        # Check checksums
         (cd /tmp && sha256sum --status -c sha256sum)
         if [ $? -ne 0 ]; then
           dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
             --msgbox "Checksum do not match!" 0 0
           continue
         fi
-        mv /tmp/bzImage "${ARPL_BZIMAGE_FILE}"
-        mv /tmp/rootfs.cpio.xz "${ARPL_RAMDISK_FILE}"
+        dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
+          --infobox "Installing new files" 0 0
+        # Process update-list.yml
+        while IFS="=" read KEY VALUE; do
+          mv /tmp/`basename "${KEY}"` "${VALUE}"
+        done < <(readConfigMap "replace" "/tmp/update-list.yml")
+        while read F; do
+          [ -f "${F}" ] && rm -f "${F}"
+          [ -d "${F}" ] && rm -Rf "${F}"
+        done < <(readConfigArray "remove" "/tmp/update-list.yml")
         dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
           --yesno "Arpl updated with success to ${TAG}!\nReboot?" 0 0
         [ $? -ne 0 ] && continue
@@ -1049,7 +1052,10 @@ while true; do
       echo "d \"Build the loader\""                   >> "${TMP_PATH}/menu"
     fi
   fi
-  loaderIsConfigured && echo "b \"Boot the loader\" " >> "${TMP_PATH}/menu"
+  if loaderIsConfigured; then
+    echo "r \"Switch direct boot: \Z4${DIRECTBOOT}\Zn\"">> "${TMP_PATH}/menu"
+    echo "b \"Boot the loader\" "                     >> "${TMP_PATH}/menu"
+  fi
   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"
@@ -1071,7 +1077,11 @@ while true; do
       NEXT="o"
       ;;
     o) selectModules; NEXT="d" ;;
-    d) make; NEXT="b" ;;
+    d) make; NEXT="r" ;;
+    r) [ "${DIRECTBOOT}" = "false" ] && DIRECTBOOT='true' || DIRECTBOOT='false'
+      writeConfigKey "directboot" "${DIRECTBOOT}" "${USER_CONFIG_FILE}"
+      NEXT="b"
+      ;;
     b) boot ;;
     u) editUserConfig; NEXT="u" ;;
     k) keymapMenu ;;

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

@@ -5,8 +5,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: igfx_off
   HddEnableDynamicPower: 1

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

@@ -5,8 +5,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   SMBusHddDynamicPower: 1
   syno_hdd_powerup_seq: 0

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

@@ -7,8 +7,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   SMBusHddDynamicPower: 1
   vender_format_version: 2

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

@@ -8,7 +8,6 @@ synoinfo: &synoinfo
   usbportcfg: "0x8700"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  small_info_path: "https://example.com/null"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0

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

@@ -8,8 +8,6 @@ synoinfo: &synoinfo
   usbportcfg: "0x8700"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0

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

@@ -9,8 +9,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"     # http://update7.synology.com/autoupdate/genRSS.php
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml" # https://update7.synology.com/autoupdate/genRSS.php
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json" # https://update7.synology.com/autoupdate/v2/getList
-  small_info_path: "https://example.com/null"                                       # https://update7.synology.com/smallupdate
-  security_version_server: "https://example.com/smallupdate"                        # https://update7.synology.com/securityVersion
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0

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

@@ -9,8 +9,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0

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

@@ -5,8 +5,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   HddEnableDynamicPower: 1

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

@@ -6,8 +6,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   HddEnableDynamicPower: 1

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

@@ -10,8 +10,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0

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

@@ -7,8 +7,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0

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

@@ -5,8 +5,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: igfx_off
   SMBusHddDynamicPower: 1

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

@@ -5,8 +5,6 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
   support_bde_internal_10g: "no"
   esataportcfg: "0x0"
 cmdline: &cmdline

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

@@ -121,7 +121,7 @@ echo "#!/bin/sh" > "${RAMDISK_PATH}/addons/addons.sh"
 echo 'echo "addons.sh called with params ${@}"' >> "${RAMDISK_PATH}/addons/addons.sh"
 chmod +x "${RAMDISK_PATH}/addons/addons.sh"
 
-# Required eudev and dtbpatch/maxdisks
+# Required addons: eudev, dtbpatch/maxdisks, powersched
 installAddon eudev
 echo "/addons/eudev.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
 if [ "${DT}" = "true" ]; then
@@ -131,6 +131,8 @@ else
   installAddon maxdisks
   echo "/addons/maxdisks.sh \${1} ${MAXDISKS}" >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
 fi
+installAddon powersched
+echo "/addons/powersched.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
 # User addons
 for ADDON in ${!ADDONS[@]}; do
   PARAMS=${ADDONS[${ADDON}]}

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

@@ -5,16 +5,18 @@ insmod test
 terminal_input console
 terminal_output console
 
-set default="0"
+set default="boot"
 set timeout="5"
 set timeout_style="menu"
 
 insmod loadenv
 if [ -s $prefix/grubenv ]; then
-  set have_grubenv=true
   load_env
 fi
-if [ "${next_entry}" ] ; then
+if [ "${default}" ]; then
+   set default="${default}"
+fi
+if [ "${next_entry}" ]; then
    set default="${next_entry}"
    set next_entry=
    save_env next_entry
@@ -36,14 +38,6 @@ else
   insmod vga
 fi
 
-insmod font
-if loadfont ${prefix}/fonts/unicode.pf2; then
-  insmod gfxterm
-  set gfxmode=auto
-  set gfxpayload=keep
-  terminal_output gfxterm
-fi
-
 insmod serial
 if serial --unit=0 --speed=115200; then
   terminal_input --append serial_com0
@@ -53,6 +47,16 @@ fi
 insmod search
 search --set=root --label "ARPL3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
+  if [ "${default}" = "direct" ]; then
+    set timeout="1"
+    menuentry 'Boot DSM kernel directly' --id direct {
+      echo "Loading DSM kernel..."
+      linux /zImage-dsm ${dsm_cmdline}
+      echo "Loading DSM initramfs..."
+      initrd /initrd-dsm
+      echo "Booting..."
+    }
+  fi
   menuentry 'Boot DSM' --id boot {
     echo "Loading kernel..."
     linux /bzImage-arpl console=ttyS0,115200n8 quiet net.ifnames=0 biosdevname=0

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

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

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

@@ -0,0 +1,16 @@
+version: 1
+name: powersched
+system: true
+description: "Utility to configure RTC according to DSM power schedule"
+compile-script: compile.sh
+all:
+  install-script: "install.sh"
+  copy: "all"
+available-for:
+  bromolow-3.10.108:
+  apollolake-4.4.180:
+  broadwell-4.4.180:
+  broadwellnk-4.4.180:
+  denverton-4.4.180:
+  geminilake-4.4.180:
+  v1000-4.4.180:

img-gen.sh

@@ -80,9 +80,16 @@ echo "Version: ${VERSION}"
 echo "Building... Drink a coffee and wait!"
 make BR2_EXTERNAL=../external -j`nproc`
 cd -
-#qemu-img convert -O vmdk -o adapter_type=lsilogic -o compat6 arpl.img arpl.vmdk
+qemu-img convert -O vmdk arpl.img arpl-dyn.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
-zip -9 "arpl-${VERSION}.vmdk.zip" arpl*.vmdk
+zip -9 "arpl-${VERSION}.vmdk-dyn.zip" arpl-dyn.vmdk
+zip -9 "arpl-${VERSION}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk
+sha256sum update-list.yml > sha256sum
+yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | while read F; do
+  (cd `dirname ${F}` && sha256sum `basename ${F}`) >> sha256sum
+done
+yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | xargs zip -9j "update.zip" sha256sum update-list.yml
+rm -f sha256sum

update-list.yml

@@ -0,0 +1,5 @@
+replace:
+  ".buildroot/output/images/bzImage": "/mnt/p3/bzImage-arpl"
+  ".buildroot/output/images/rootfs.cpio.xz": "/mnt/p3/initrd-arpl"
+  "files/board/arpl/p1/grub/grub.cfg": "/mnt/p1/grub/grub/cfg"
+remove: