yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

New kernel 5.x bzImage template

Browse Source 
Other fixes
This commit is contained in:
Fabio Belavenuto 2022-12-21 13:15:11 -03:00
parent a9eafb4ef6
commit aebed0422d
19 changed files with 9 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/board/arpl/overlayfs/opt/arpl/boot.sh
View File

@ -78,7 +78,7 @@ done < <(readConfigMap "cmdline" "${USER_CONFIG_FILE}")
# Check if machine has EFI # Check if machine has EFI
[ -d /sys/firmware/efi ] && EFI=1 || EFI=0 [ -d /sys/firmware/efi ] && EFI=1 || EFI=0
# Read EFI bug value # Read EFI bug value
EFI_BUG="`readModelKey "${MODEL}" "builds.${BUILD}.efi-bug"`" [ "${MODEL}" = "DS3615" ] && EFI_BUG=1 || EFI_BUG=0
LOADER_DISK="`blkid | grep 'LABEL="ARPL3"' | cut -d3 -f1`" LOADER_DISK="`blkid | grep 'LABEL="ARPL3"' | cut -d3 -f1`"
BUS=`udevadm info --query property --name ${LOADER_DISK} | grep ID_BUS | cut -d= -f2` BUS=`udevadm info --query property --name ${LOADER_DISK} | grep ID_BUS | cut -d= -f2`
@ -106,7 +106,7 @@ grep -q "force_junior" /proc/cmdline && CMDLINE_LINE+="force_junior "
[ ${EFI} -eq 1 ] && CMDLINE_LINE+="withefi " [ ${EFI} -eq 1 ] && CMDLINE_LINE+="withefi "
[ "${BUS}" = "ata" ] && CMDLINE_LINE+="synoboot_satadom=${DOM} dom_szmax=${SIZE} " [ "${BUS}" = "ata" ] && CMDLINE_LINE+="synoboot_satadom=${DOM} dom_szmax=${SIZE} "
CMDLINE_DIRECT="${CMDLINE_LINE}" CMDLINE_DIRECT="${CMDLINE_LINE}"
CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8250,io,0x3f8,115200n8 root=/dev/md0 loglevel=15" CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk earlycon=uart8250,io,0x3f8,115200n8 root=/dev/md0 loglevel=15 log_buf_len=32M"
for KEY in ${!CMDLINE[@]}; do for KEY in ${!CMDLINE[@]}; do
VALUE="${CMDLINE[${KEY}]}" VALUE="${CMDLINE[${KEY}]}"
CMDLINE_LINE+=" ${KEY}" CMDLINE_LINE+=" ${KEY}"
@ -150,9 +150,9 @@ echo -e "\033[1;37mLoading DSM kernel...\033[0m"
# Executes DSM kernel via KEXEC # Executes DSM kernel via KEXEC
if [ "${EFI_BUG}" = "yes" -a ${EFI} -eq 1 ]; then 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" echo -e "\033[1;33mWarning, running kexec with --noefi param, strange things will happen!!\033[0m"
kexec --args-linux --noefi -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog kexec --noefi -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
else else
kexec --args-linux -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog kexec -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
fi fi
/sbin/swapoff -a >/dev/null 2>&1 || true /sbin/swapoff -a >/dev/null 2>&1 || true
/bin/umount -a -r >/dev/null 2>&1 || true /bin/umount -a -r >/dev/null 2>&1 || true

BIN
files/board/arpl/overlayfs/opt/arpl/bzImage-template-v5.gz
View File

Binary file not shown.

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

@ -30,7 +30,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -51,7 +50,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -72,7 +70,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -32,7 +32,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -53,7 +52,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -74,7 +72,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -33,7 +33,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -53,7 +52,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -74,7 +72,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -33,7 +33,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "3.10.108" kver: "3.10.108"
rd-compressed: false rd-compressed: false
efi-bug: yes
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -55,7 +54,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "3.10.108" kver: "3.10.108"
rd-compressed: false rd-compressed: false
efi-bug: yes
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -77,7 +75,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "3.10.108" kver: "3.10.108"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -33,7 +33,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -55,7 +54,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -77,7 +75,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -34,7 +34,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -56,7 +55,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -78,7 +76,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -36,7 +36,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -58,7 +57,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -80,7 +78,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -32,7 +32,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -53,7 +52,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -74,7 +72,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

1
files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
View File

@ -32,7 +32,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -34,7 +34,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -55,7 +54,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -35,7 +35,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -57,7 +56,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -79,7 +77,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -34,7 +34,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -56,7 +55,6 @@ builds:
ver: "7.1.0" ver: "7.1.0"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -78,7 +76,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -30,7 +30,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -51,7 +50,6 @@ builds:
ver: "7.1" ver: "7.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -72,7 +70,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

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

@ -31,7 +31,6 @@ builds:
ver: "7.0.1" ver: "7.0.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -53,7 +52,6 @@ builds:
ver: "7.1" ver: "7.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:
@ -75,7 +73,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "4.4.180" kver: "4.4.180"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

1
files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml
View File

@ -29,7 +29,6 @@ builds:
ver: "7.1.1" ver: "7.1.1"
kver: "5.10.55" kver: "5.10.55"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo:

12
files/board/arpl/overlayfs/opt/arpl/vmlinux-to-bzImage.sh
View File

@ -71,12 +71,10 @@ else
# Kernel version 5.x # Kernel version 5.x
gzip -cd "${SCRIPT_DIR}/bzImage-template-v5.gz" > "${ZIMAGE_MOD}" gzip -cd "${SCRIPT_DIR}/bzImage-template-v5.gz" > "${ZIMAGE_MOD}"
lzma -9c ${VMLINUX_MOD} > ${TMP_PATH}/vmlinux-mod.lzma dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=14561 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
dd if="${TMP_PATH}/vmlinux-mod.lzma" of="${ZIMAGE_MOD}" bs=15377 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=34463421 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=8377991 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=34479132 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=8420412 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog # RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh"`
# size_le ${RUN_SIZE} | dd of=${ZIMAGE_MOD} bs=34626904 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh"`
size_le ${RUN_SIZE} | dd of=${ZIMAGE_MOD} bs=8420408 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
size_le $(($((16#`crc32 "${ZIMAGE_MOD}" | awk '{print$1}'`)) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog size_le $(($((16#`crc32 "${ZIMAGE_MOD}" | awk '{print$1}'`)) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog
fi fi

1
new_bn.sh
View File

@ -56,7 +56,6 @@ for MODEL in DS918+ DS920+ DS923+ DS1520+ DS1621+ DS2422+ DS3615xs DS3617xs DS36
ver: "${RELEASE}" ver: "${RELEASE}"
kver: "${KVERS[${MODEL}]}" kver: "${KVERS[${MODEL}]}"
rd-compressed: false rd-compressed: false
efi-bug: no
cmdline: cmdline:
<<: *cmdline <<: *cmdline
synoinfo: synoinfo: