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

Adding support to boot kernel v5.x

Browse Source
This commit is contained in:
Fabio Belavenuto 2022-12-08 11:16:18 -03:00
parent 6c5fef1ce3
commit e458dd14ff
4 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
files/board/arpl/overlayfs/opt/arpl/zImage_template.gz → files/board/arpl/overlayfs/opt/arpl/bzImage-template-v4.gz
View File

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

Binary file not shown.

6
files/board/arpl/overlayfs/opt/arpl/menu.sh
View File

@ -1187,9 +1187,9 @@ while true; do
s) serialMenu; NEXT="a" ;; s) serialMenu; NEXT="a" ;;
a) addonMenu; NEXT="x" ;; a) addonMenu; NEXT="x" ;;
x) cmdlineMenu; NEXT="i" ;; x) cmdlineMenu; NEXT="i" ;;
i) synoinfoMenu; NEXT="d" ;; i) synoinfoMenu; NEXT="v" ;;
d) make; NEXT="v" ;; v) advancedMenu; NEXT="d" ;;
v) advancedMenu; NEXT="b" ;; d) make; NEXT="b" ;;
b) boot ;; b) boot ;;
k) keymapMenu ;; k) keymapMenu ;;
c) dialog --backtitle "`backtitle`" --title "Cleaning" --aspect 18 \ c) dialog --backtitle "`backtitle`" --title "Cleaning" --aspect 18 \

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

@ -1,21 +1,11 @@
#!/bin/sh #!/bin/sh
# Based on code and ideas from @jumkey
. /opt/arpl/include/functions.sh . /opt/arpl/include/functions.sh
#zImage_head 16494 MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
#payload( BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
# vmlinux.bin x KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`"
# padding 0xf00000-x
# vmlinux.bin size 4
#) 0xf00004
#zImage_tail(
# unknown 72
# run_size 4
# unknown 30
# vmlinux.bin size 4
# unknown 114460
#) 114570
#crc32 4
# Adapted from: scripts/Makefile.lib # Adapted from: scripts/Makefile.lib
# Usage: size_append FILE [FILE2] [FILEn]... # Usage: size_append FILE [FILE2] [FILEn]...
@ -51,12 +41,41 @@ size_le () {
SCRIPT_DIR=`dirname $0` SCRIPT_DIR=`dirname $0`
VMLINUX_MOD=${1} VMLINUX_MOD=${1}
ZIMAGE_MOD=${2} ZIMAGE_MOD=${2}
gzip -cd "${SCRIPT_DIR}/zImage_template.gz" > "${ZIMAGE_MOD}" if [ ${KVER:0:1} -eq 4 ]; then
# Kernel version 4.x
#zImage_head 16494
#payload(
# vmlinux.bin x
# padding 0xf00000-x
# vmlinux.bin size 4
#) 0xf00004
#zImage_tail(
# unknown 72
# run_size 4
# unknown 30
# vmlinux.bin size 4
# unknown 114460
#) 114570
#crc32 4
gzip -cd "${SCRIPT_DIR}/bzImage-template-v4.gz" > "${ZIMAGE_MOD}"
dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=16494 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=16494 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745134 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745134 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745244 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh"` RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh"`
size_le $RUN_SIZE | dd of=$ZIMAGE_MOD bs=15745210 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog size_le ${RUN_SIZE} | dd of=${ZIMAGE_MOD} bs=15745210 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745244 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 else
# Kernel version 5.x
gzip -cd "${SCRIPT_DIR}/bzImage-template-v5.gz" > "${ZIMAGE_MOD}"
lzma -9c ${VMLINUX_MOD} > ${TMP_PATH}/vmlinux-mod.lzma
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=8377991 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=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
fi