Merge pull request #130 from fbelavenuto/dev

eudev fixed

.github/workflows/main.yml

@@ -84,14 +84,15 @@ 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.vmdk
+          qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat arpl.vmdk
 
       # Zip image
       - name: Pack
         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
+          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk.zip" arpl*.vmdk
 
       # Upload artifact
       - name: Upload
@@ -100,7 +101,7 @@ jobs:
           name: Images
           path: |
             arpl.img
-            arpl.vmdk
+            arpl*.vmdk
           retention-days: 5
 
       # Publish a release if is a tag

TODO

@@ -29,3 +29,5 @@ Concluidos:
  - Mudar synoinfo para ler do modelo e preencher no user_config, para usuário poder deletar entradas do modelo
  - Validar netif_num e macX
  - Descobrir como é o serial do DS2422+
+ - Retirar o ttyd da memória quando o root do dsm dar boot
+ - Adicionar mais binários para o addon dbgutils (nano, strace, etc)

VERSION

@@ -1 +1 @@
-0.4-alpha3
+0.4-alpha4

docker/Dockerfile.template

@@ -24,15 +24,18 @@ ENV SHELL=/bin/bash \
 
 RUN apt update --yes && \
     apt install --yes --no-install-recommends --no-install-suggests \
-      ca-certificates nano curl bc kmod git gettext texinfo autopoint \
+      ca-certificates nano curl bc kmod git gettext texinfo autopoint gawk sudo \
       build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    useradd --home-dir /input --no-create-home --shell /bin/bash --uid 1000 arpl && \
+    echo "arpl ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/arpl
 
 COPY --from=stage /opt /opt
 COPY files/ /
 
 WORKDIR /input
 VOLUME /input /output
+USER arpl
 
 ENTRYPOINT ["/opt/do.sh"]

docker/files/opt/do.sh

@@ -15,6 +15,9 @@ function export-vars() {
   export LDFLAGS="-I/opt/${1}/lib"
   export LD_LIBRARY_PATH="/opt/${1}/lib"
   export ARCH=x86_64
+  export PATH="/opt/${1}/bin:${PATH}"
+  export CC="x86_64-pc-linux-gnu-gcc"
+  export LD="x86_64-pc-linux-gnu-ld"
 }
 
 ###############################################################################

files/board/arpl/make-img.sh

@@ -45,6 +45,8 @@ 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
+cp "${BINARIES_DIR}/bzImage" ~/bzImage-arpl
+cp "${BINARIES_DIR}/rootfs.cpio.xz" ~/initrd-arpl
 
 echo "Unmount image file"
 sudo umount "${BINARIES_DIR}/p1"

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

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

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

@@ -684,14 +684,14 @@ function make() {
 
   [ ! -f "${ORI_ZIMAGE_FILE}" -o ! -f "${ORI_RDGZ_FILE}" ] && extractDsmFiles
 
-  /opt/arpl/zimage-patch.sh
+  /opt/arpl/zimage-patch.sh | tee -a "${LOG_FILE}"
   if [ $? -ne 0 ]; then
     dialog --backtitle "`backtitle`" --title "Error" --aspect 18 \
       --msgbox "zImage not patched:\n`<"${LOG_FILE}"`" 0 0
     return 1
   fi
 
-  /opt/arpl/ramdisk-patch.sh
+  /opt/arpl/ramdisk-patch.sh | tee -a "${LOG_FILE}"
   if [ $? -ne 0 ]; then
     dialog --backtitle "`backtitle`" --title "Error" --aspect 18 \
       --msgbox "Ramdisk not patched:\n`<"${LOG_FILE}"`" 0 0

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

@@ -4,6 +4,9 @@ synoinfo: &synoinfo
   support_memory_compatibility: "no"
   esataportcfg: "0x00"
   support_bde_internal_10g: "no"
+  supportraidgroup: "no"
+  support_syno_hybrid_raid: "yes"
+  internalportcfg: "0xfffff"
   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"
@@ -73,7 +76,7 @@ builds:
 
   42951:
     ver: "7.1.1"
-    kver: ""
+    kver: "4.4.180"
     rd-compressed: false
     efi-bug: no
     cmdline:

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

@@ -40,7 +40,7 @@ builds:
       hash: "4d060be8afec548fdb042bc8095524f10ff200033cab74df37ae07f3de5eaa69"
       ramdisk-hash: "cbe9099c57f23ba53415574b011580218fa55a0bdb83c4e4bba9e27100e5379d"
       zimage-hash: "f6816165a52b1f53ce44a45878fe06641da34e9478947f826a236c1a6548f8fd"
-      md5-hash: ""
+      md5-hash: "70550293c612c1fd9a8d1b7485173877"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"

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

@@ -0,0 +1,14 @@
+version: 1
+name: lsiutil
+description: "A tool for working with some LSI RAID controllers"
+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:

files/configs/arpl_defconfig

@@ -60,5 +60,6 @@ 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_HOST_MKPASSWD=y
 BR2_PACKAGE_R8168=y
 BR2_PACKAGE_R8125=y

img-gen.sh

@@ -80,9 +80,9 @@ echo "Version: ${VERSION}"
 echo "Building... Drink a coffee and wait!"
 make BR2_EXTERNAL=../external
 cd -
-qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img arpl.vmdk
+#qemu-img convert -O vmdk -o adapter_type=lsilogic -o compat6 arpl.img arpl.vmdk
-#qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat 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
-zip -9 "arpl-${VERSION}.vmdk.zip" arpl.vmdk
+zip -9 "arpl-${VERSION}.vmdk.zip" arpl*.vmdk

rss.json

@@ -235,6 +235,11 @@
             "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DVA3221_42218.pat",
             "mCheckSum": "b8bd6562290d06dd3a7360f3af330bec"
           },
+          {
+            "mUnique": "synology_v1000_fs2500",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_FS2500_42218.pat",
+            "mCheckSum": "70550293c612c1fd9a8d1b7485173877"
+          },
           {
             "mUnique": "synology_broadwellnk_rs4021xs+",
             "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_RS4021xs%2B_42218.pat",

rss.xml

@@ -223,6 +223,11 @@
         <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DVA3221_42218.pat</mLink>
         <mCheckSum>b8bd6562290d06dd3a7360f3af330bec</mCheckSum>
       </model>
+      <model>
+        <mUnique>synology_v1000_fs2500</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_FS2500_42218.pat</mLink>
+        <mCheckSum>70550293c612c1fd9a8d1b7485173877</mCheckSum>
+      </model>
       <model>
         <mUnique>synology_broadwellnk_rs4021xs+</mUnique>
         <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_RS4021xs%2B_42218.pat</mLink>