add support ds918+ 6.2.4. update 5

.github/workflows/buildroot.yml

@@ -0,0 +1,47 @@
+name: buildroot
+
+on:
+  workflow_dispatch:
+    inputs:
+      git-address:
+        description: 'git-address'
+        required: true
+        default: 'https://github.com/buildroot/buildroot.git'
+      branches-tags:
+        description: 'branches-tags'
+        required: true
+        default: '2022.02'
+      board:
+        description: 'board'
+        required: true
+        default: 'syno'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Clone source code
+        run: |
+          git clone ${{github.event.inputs.git-address}} /opt/buildroot
+          cd /opt/buildroot
+      - name: Install packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libelf-dev
+      - name: Bulid
+        run: |
+          mkdir /opt/firmware
+          cd /opt/buildroot
+          git checkout ${{github.event.inputs.branches-tags}}
+          git pull origin ${{github.event.inputs.branches-tags}}
+          cp -rf /home/runner/work/redpill-load/redpill-load/buildroot/* .
+          echo '---start make---'
+          make ${{github.event.inputs.board}}_defconfig
+          make
+          cp -r /opt/buildroot/output/images /opt/firmware
+      - name: Upload buildroot-${{github.event.inputs.branches-tags}}-${{github.event.inputs.board}}
+        uses: actions/upload-artifact@v3
+        with:
+          name: buildroot-${{github.event.inputs.branches-tags}}-${{github.event.inputs.board}}
+          path: /opt/firmware

.github/workflows/make.yml

@@ -0,0 +1,118 @@
+name: Make kernel bs patch
+
+on:
+  workflow_dispatch:
+    inputs:
+      pat-address:
+        description: 'Pat file URL'
+        required: true
+        default: 'https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS918%2B_42218.pat'
+      toolchain:
+        description: 'DSM toolchain URL for repack zImage'
+        required: true
+        default: 'https://sourceforge.net/projects/dsgpl/files/Tool%20Chain/DSM%207.0.0%20Tool%20Chains/Intel%20x86%20Linux%204.4.180%20%28Apollolake%29/apollolake-gcc750_glibc226_x86_64-GPL.txz'
+      linux-src:
+        description: 'Linux kernel source URL for repack zImage'
+        required: true
+        default: 'https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.180.tar.xz'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Bulid
+        id: bulid-bsp
+        run: |
+          patfile=$(basename ${{github.event.inputs.pat-address}} | while read; do echo -e ${REPLY//%/\\x}; done)
+          echo "::set-output name=patfile::$patfile"
+          # install bsdiff
+          sudo apt-get install -y bsdiff
+
+          #ls -al $GITHUB_WORKSPACE/
+          mkdir /opt/build
+          mkdir /opt/dist
+          cd /opt/build
+          curl -L ${{github.event.inputs.pat-address}} -o ds.pat
+          curl -L ${{github.event.inputs.toolchain}} -o toolchain.txz
+          curl -L ${{github.event.inputs.linux-src}} -o linux.tar.xz
+          mkdir pat
+          tar xf ds.pat -C pat
+          # is update_pack
+          if [ ! -f "pat/zImage" ]; then
+            cd pat
+            ar x $(ls flashupdate*)
+            tar xf data.tar.xz
+            cd ..
+          fi
+          mkdir toolchain
+          tar xf toolchain.txz -C toolchain
+          mkdir linux-src
+          tar xf linux.tar.xz --strip-components 1 -C linux-src
+
+          # extract vmlinux
+          ./linux-src/scripts/extract-vmlinux pat/zImage > vmlinux
+          # sha256
+          sha256sum ds.pat >> checksum.sha256
+          sha256sum pat/zImage >> checksum.sha256
+          sha256sum pat/rd.gz >> checksum.sha256
+          sha256sum vmlinux >> checksum.sha256
+          # patch vmlinux
+          # vmlinux_mod.bin
+          curl -L https://github.com/jumkey/dsm-research/raw/master/tools/common.php -o common.php
+          curl -L https://github.com/jumkey/dsm-research/raw/master/tools/patch-ramdisk-check.php -o patch-ramdisk-check.php
+          curl -L https://github.com/jumkey/dsm-research/raw/master/tools/patch-boot_params-check.php -o patch-boot_params-check.php
+          php patch-boot_params-check.php vmlinux vmlinux-mod
+          php patch-ramdisk-check.php vmlinux-mod vmlinux_mod.bin
+
+          git clone https://github.com/kiler129/recreate-zImage.git
+          chmod +x recreate-zImage/rebuild_kernel.sh
+          cd linux-src
+          # ---------- make zImage_mod
+          # Make file more anonymous
+          export KBUILD_BUILD_TIMESTAMP="1970/1/1 00:00:00"
+          export KBUILD_BUILD_USER="root"
+          export KBUILD_BUILD_HOST="localhost"
+          export KBUILD_BUILD_VERSION=0
+
+          export ARCH=x86_64
+          export CROSS_COMPILE=/opt/build/toolchain/x86_64-pc-linux-gnu/bin/x86_64-pc-linux-gnu-
+          #make olddefconfig
+          make defconfig
+          # change to lzma
+          sed -i 's/CONFIG_KERNEL_GZIP=y/# CONFIG_KERNEL_GZIP is not set/' .config
+          sed -i 's/# CONFIG_KERNEL_LZMA is not set/CONFIG_KERNEL_LZMA=y/' .config
+          << see_below
+          make clean
+          sed -i 's/bzImage: vmlinux/bzImage: /' arch/x86/Makefile
+          make vmlinux -j4 || true # make some *.o inspire by UnknowO
+          cp ../vmlinux_mod.bin vmlinux # vmlinux_mod.bin is already stripped of debugging and comments, strippe again should be ok
+          make bzImage
+          sed -i 's/bzImage: /bzImage: vmlinux/' arch/x86/Makefile
+          cp arch/x86/boot/bzImage ../zImage_mod
+          make clean
+          see_below
+          # for DS3615xs
+          #sed -i 's/   -std=gnu89$/   -std=gnu89 $(call cc-option,-fno-PIE)/' Makefile
+          sed -i 's/ ld -/ ${CROSS_COMPILE}ld -/' ../recreate-zImage/rebuild_kernel.sh
+          sed -i 's/(ld -/(${CROSS_COMPILE}ld -/' ../recreate-zImage/rebuild_kernel.sh
+          sed -i 's/ gcc / ${CROSS_COMPILE}gcc /' ../recreate-zImage/rebuild_kernel.sh
+          sed -i 's/ nm / ${CROSS_COMPILE}nm /' ../recreate-zImage/rebuild_kernel.sh
+          sed -i 's/ objcopy / ${CROSS_COMPILE}objcopy /' ../recreate-zImage/rebuild_kernel.sh
+          sed -i 's/(objdump /(${CROSS_COMPILE}objdump /' ../recreate-zImage/rebuild_kernel.sh
+          sed -i 's/ readelf / ${CROSS_COMPILE}readelf /' ../recreate-zImage/rebuild_kernel.sh
+          ../recreate-zImage/rebuild_kernel.sh $PWD/../linux-src ../vmlinux_mod.bin ../zImage_mod
+          # ----------
+          cd ..
+          bsdiff pat/zImage zImage_mod diff.bsp
+
+          echo '---copy file---'
+          cp vmlinux /opt/dist
+          cp vmlinux_mod.bin /opt/dist
+          cp diff.bsp /opt/dist
+          cp checksum.sha256 /opt/dist
+          echo '---END---'
+      - name: Upload
+        uses: actions/upload-artifact@v2
+        with:
+          name: kernel bs patch for ${{ steps.bulid-bsp.outputs.patfile }}
+          path: /opt/dist

build-loader.sh

@@ -12,6 +12,7 @@ cd "${BASH_SOURCE%/*}/" || exit 1
 ########################################################################################################################
 
 ##### CONFIGURATION YOU CAN OVERRIDE USING ENVIRONMENT #################################################################
+BRP_JUN_MOD=${BRP_JUN_MOD:-0} # whether you want to use jun's mod
 BRP_DEBUG=${BRP_DEBUG:-0} # whether you want to see debug messages
 BRP_CACHE_DIR=${BRP_CACHE_DIR:-"$PWD/cache"} # cache directory where stuff is downloaded & unpacked
 BRP_USER_CFG=${BRP_USER_CFG:-"$PWD/user_config.json"}
@@ -257,6 +258,7 @@ fi
 readonly BRP_RD_FILE=${BRP_UPAT_DIR}/$(brp_json_get_field "${BRP_REL_CONFIG_JSON}" 'files.ramdisk.name') # original ramdisk file
 readonly BRP_URD_DIR="${BRP_BUILD_DIR}/rd-${BRP_REL_OS_ID}-unpacked" # folder with unpacked ramdisk contents
 readonly BRP_RD_REPACK="${BRP_BUILD_DIR}/rd-patched-${BRP_REL_OS_ID}.gz" # repacked ramdisk file
+readonly BRP_JUN_PATCH="${BRP_USER_DIR}/jun.patch" # jun.patch
 
 #rm -rf build/testing/rd-* # for debugging ramdisk routines; also comment-out rm of BRP_URD_DIR
 #rm "${BRP_RD_REPACK}" # for testing
@@ -272,6 +274,17 @@ if [ ! -f "${BRP_RD_REPACK}" ]; then # do we even need to unpack-modify-repack t
     pr_info "Found unpacked ramdisk at \"%s\" - skipping unpacking" "${BRP_URD_DIR}"
   fi
 
+  if [ "${BRP_JUN_MOD}" -eq 1 ]; then
+    pushd ${BRP_URD_DIR}
+    git init
+    git config user.name "Mona Lisa"
+    git config user.email "[email protected]"
+    git add -A
+    git commit -m "import ramdisk"
+    git tag baseline
+    popd
+  fi
+
   # Applies all static .patch files to the ramdisk
   brp_apply_text_patches \
     "${BRP_URD_DIR}" \
@@ -317,16 +330,30 @@ if [ ! -f "${BRP_RD_REPACK}" ]; then # do we even need to unpack-modify-repack t
         || pr_crit "Failed to move mfgBIOS LKM"
   fi
 
+  if [ "${BRP_JUN_MOD}" -eq 1 ]; then
+    git -C ${BRP_URD_DIR} diff baseline > ${BRP_JUN_PATCH}
+    pushd ${BRP_URD_DIR}
+    # rm .git
+    "${RM_PATH}" -rf .git
+    popd
+  fi
+
   # Finally, we can finish ramdisk modifications with repacking it
   readonly BRP_RD_COMPRESSED=$(brp_json_get_field "${BRP_REL_CONFIG_JSON}" "extra.compress_rd")
 
-  pr_process "Repacking ramdisk to %s" "${BRP_RD_REPACK}"
-  if [ "${BRP_RD_COMPRESSED}" == "true" ]; then
-    brp_pack_zrd "${BRP_RD_REPACK}" "${BRP_URD_DIR}"
-  elif [ "${BRP_RD_COMPRESSED}" == "false" ]; then
-    brp_pack_cpiord "${BRP_RD_REPACK}" "${BRP_URD_DIR}"
+  if [ "${BRP_JUN_MOD}" -eq 1 ]; then
+    cp ${BRP_RD_FILE} ${BRP_RD_REPACK}
   else
-    pr_crit "Invalid value for platform extra.compress_rd (expected bool, got \"%s\")" "${BRP_RD_COMPRESSED}"
+    pr_process "Repacking ramdisk to %s" "${BRP_RD_REPACK}"
+    if [ "${BRP_RD_COMPRESSED}" == "true" ]; then
+      brp_pack_zrd "${BRP_RD_REPACK}" "${BRP_URD_DIR}"
+      # add fake 64byte sign
+      dd if=/dev/zero of=${BRP_RD_REPACK} bs=$((3-(($(stat --format=%s ${BRP_RD_REPACK})+3)&0x03)+64)) count=1 conv=notrunc oflag=append
+    elif [ "${BRP_RD_COMPRESSED}" == "false" ]; then
+      brp_pack_cpiord "${BRP_RD_REPACK}" "${BRP_URD_DIR}"
+    else
+      pr_crit "Invalid value for platform extra.compress_rd (expected bool, got \"%s\")" "${BRP_RD_COMPRESSED}"
+    fi
   fi
   pr_process_ok
 
@@ -384,13 +411,28 @@ if [[ "${BRP_DEV_DISABLE_EXTS}" -ne 1 ]]; then
   pr_process_ok
 fi
 
-pr_process "Packing custom ramdisk layer to %s" "${BRP_CUSTOM_RD_PATH}"
-if [ "${BRP_RD_COMPRESSED}" == "true" ]; then
+if [ "${BRP_JUN_MOD}" -eq 1 ]; then
+  brp_mkdir "${BRP_CUSTOM_DIR}/usr/bin"
+  brp_mkdir "${BRP_CUSTOM_DIR}/etc"
+  "${CP_PATH}" --recursive --dereference "${BRP_COMMON_CFG_BASE}/jun/init" "${BRP_CUSTOM_DIR}/init"
+  "${CP_PATH}" --recursive --dereference "${BRP_COMMON_CFG_BASE}/jun/usr/bin/patch" "${BRP_CUSTOM_DIR}/usr/bin/patch"
+  "${CP_PATH}" --recursive --dereference "${BRP_JUN_PATCH}" "${BRP_CUSTOM_DIR}/etc/jun.patch"
+
+  pr_process "Packing custom ramdisk layer to %s" "${BRP_CUSTOM_RD_PATH}"
   brp_pack_zrd "${BRP_CUSTOM_RD_PATH}" "${BRP_CUSTOM_DIR}"
-elif [ "${BRP_RD_COMPRESSED}" == "false" ]; then
-  brp_pack_cpiord "${BRP_CUSTOM_RD_PATH}" "${BRP_CUSTOM_DIR}"
+  # add fake 64byte sign
+  dd if=/dev/zero of=${BRP_CUSTOM_RD_PATH} bs=$((3-(($(stat --format=%s ${BRP_RD_REPACK})+3)&0x03)+64)) count=1 conv=notrunc oflag=append
 else
-  pr_crit "Invalid value for platform extra.compress_rd (expected bool, got \"%s\")" "${BRP_RD_COMPRESSED}"
+  pr_process "Packing custom ramdisk layer to %s" "${BRP_CUSTOM_RD_PATH}"
+  if [ "${BRP_RD_COMPRESSED}" == "true" ]; then
+    brp_pack_zrd "${BRP_CUSTOM_RD_PATH}" "${BRP_CUSTOM_DIR}"
+    # add fake 64byte sign
+    dd if=/dev/zero of=${BRP_CUSTOM_RD_PATH} bs=$((3-(($(stat --format=%s ${BRP_RD_REPACK})+3)&0x03)+64)) count=1 conv=notrunc oflag=append
+  elif [ "${BRP_RD_COMPRESSED}" == "false" ]; then
+    brp_pack_cpiord "${BRP_CUSTOM_RD_PATH}" "${BRP_CUSTOM_DIR}"
+  else
+    pr_crit "Invalid value for platform extra.compress_rd (expected bool, got \"%s\")" "${BRP_RD_COMPRESSED}"
+  fi
 fi
 pr_process_ok
 

buildroot/README.md

@@ -0,0 +1,13 @@
+# Build
+
+```shell
+git clone git://git.buildroot.net/buildroot
+cd buildroot
+# copy custom files
+make syno_defconfig
+make
+# get bzImage rootfs.cpio.lzma
+ls output/images
+```
+
+[see .github/workflows/buildroot.yml](../.github/workflows/buildroot.yml)