Merge pull request #47 from fbelavenuto/dev

Update modules set DIRTY flag

TODO

@@ -1,6 +1,8 @@
 A fazer
  - Descobrir como é o serial do DS2422+
  - Estudar acrescentar modo simples e avançado do menu
+ - Mudar synoinfo para ler do modelo e preencher no user_config, para usuário poder deletar entradas do modelo
+ - Acertar flag DIRTY ao atualizar módulos, etc
 
 Concluidos:
  - Generalizar código dos addons

docker/files/opt/do.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 function compile-module {
   # Validate
   if [ -z "${1}" ]; then
@@ -19,7 +21,7 @@ function compile-module {
   fi
   echo "Compiling module for ${PLATFORM}-${KVER}..."
   cp -R /input /tmp
-  make -C "/opt/${PLATFORM}" M="/tmp/input" PLATFORM=${PLATFORM^^} modules
+  make -C "/opt/${PLATFORM}" M="/tmp/input" ${PLATFORM^^}-Y=y ${PLATFORM^^}-M=m modules
   while read F; do
     strip -g "${F}"
     echo "Copying `basename ${F}`"

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

@@ -784,6 +784,7 @@ function updateMenu() {
           mkdir -p "${DEST_PATH}/${ADDON}"
           tar xaf "${PKG}" -C "${DEST_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 +810,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 +847,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

@@ -47,3 +47,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/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
@@ -60,7 +60,7 @@ if [ -s /zImage -a -s /rd.gz ]; then
     initrd /initrd-arpl
     echo "Booting..."
   }
-  menuentry 'Boot DSM into junior' --id junior {
+  menuentry 'Force re-install DSM' --id junior {
     echo "Loading kernel..."
     linux /bzImage-arpl console=ttyS0,115200n8 quiet force_junior
     echo "Loading initramfs..."