Added V3 bootimgs extraction

Signed-off-by: AndroiableDroid <mohd.faraz.abc@gmail.com>

dumper.sh

@@ -122,7 +122,7 @@ GDRIVE="${UTILSDIR}"/downloaders/gdrive.sh
 AFHDL="${UTILSDIR}"/downloaders/afh_dl.py
 
 # Partition List That Are Currently Supported
-PARTITIONS="system system_ext system_other systemex vendor cust odm oem factory product xrom modem dtbo boot recovery tz oppo_product preload_common opproduct reserve india my_preload my_odm my_stock my_operator my_country my_product my_company my_engineering my_heytap"
+PARTITIONS="system system_ext system_other systemex vendor cust odm oem factory product xrom modem dtbo boot vendor_boot recovery tz oppo_product preload_common opproduct reserve india my_preload my_odm my_stock my_operator my_country my_product my_company my_engineering my_heytap"
 EXT4PARTITIONS="system vendor cust odm oem factory product xrom systemex oppo_product preload_common"
 OTHERPARTITIONS="tz.mbn:tz tz.img:tz modem.img:modem NON-HLOS:modem boot-verified.img:boot recovery-verified.img:recovery dtbo-verified.img:dtbo"
 
@@ -544,10 +544,10 @@ elif 7z l -ba "${FILEPATH}" | grep ".*.rar\|.*.zip\|.*.7z\|.*.tar$" || [[ $(find
 	printf "Rar/Zip/7Zip/Tar Archived Firmware Detected\n"
 	if [[ -f "${FILEPATH}" ]]; then
 		mkdir -p "${TMPDIR}"/"${UNZIP_DIR}" 2>/dev/null
-		7z e -y "${FILEPATH}" -o"${TMPDIR}"/"${UNZIP_DIR}" 2>/dev/null >> "${TMPDIR}"/zip.log
+		7z e -y "${FILEPATH}" -o"${TMPDIR}"/"${UNZIP_DIR}"  >> "${TMPDIR}"/zip.log
 		for f in "${TMPDIR}"/"${UNZIP_DIR}"/*; do detox -r "${UNZIP_DIR}"/"${f}" 2>/dev/null; done
 	fi
-	zip_list=$(find ./"${UNZIP_DIR}" -type f -size +300M \( -name "*.rar" -o -name "*.zip" -o -name "*.7z" -o -name "*.tar"\) | cut -d'/' -f'2-' | sort)
+	zip_list=$(find ./"${UNZIP_DIR}" -type f -size +300M \( -name "*.rar" -o -name "*.zip" -o -name "*.7z" -o -name "*.tar" \) | cut -d'/' -f'2-' | sort)
 	mkdir -p "${INPUTDIR}" 2>/dev/null
 	rm -rf "${INPUTDIR:?}"/* 2>/dev/null
 	for file in ${zip_list}; do
@@ -629,12 +629,32 @@ if [[ -f "${OUTDIR}"/boot.img ]]; then
 	bash "${EXTRACT_IKCONFIG}" "${OUTDIR}"/boot.img > "${OUTDIR}"/bootRE/ikconfig >/dev/null 2>&1
 	[[ ! -s "${OUTDIR}"/bootRE/ikconfig ]] && rm -f "${OUTDIR}"/bootRE/ikconfig 2>/dev/null
 	# vmlinux-to-elf
-	python3 "${KALLSYMS_FINDER}" "${OUTDIR}"/boot.img > "${OUTDIR}"/bootRE/boot_kallsyms.txt >/dev/null 2>&1
+	if [ ! -f "${OUTDIR}"/vendor_boot.img ]; then
-	printf "boot_kallsyms.txt generated\n"
+		python3 "${KALLSYMS_FINDER}" "${OUTDIR}"/boot.img > "${OUTDIR}"/bootRE/boot_kallsyms.txt >/dev/null 2>&1
+		printf "boot_kallsyms.txt generated\n"
+	else
+		python3 "${KALLSYMS_FINDER}" "${OUTDIR}"/boot/kernel > "${OUTDIR}"/bootRE/kernel_kallsyms.txt >/dev/null 2>&1
+		printf "kernel_kallsyms.txt generated\n"
+	fi
 	python3 "${VMLINUX2ELF}" "${OUTDIR}"/boot.img "${OUTDIR}"/bootRE/boot.elf >/dev/null 2>&1
 	printf "boot.elf generated\n"
 fi
 
+# Extract vendor_boot.img
+if [[ -f "${OUTDIR}"/vendor_boot.img ]]; then
+	# Extract dts
+	mkdir -p "${OUTDIR}"/vendor_bootimg "${OUTDIR}"/vendor_bootdts 2>/dev/null
+	python3 "${DTB_EXTRACTOR}" "${OUTDIR}"/vendor_boot.img -o "${OUTDIR}"/vendor_bootimg >/dev/null
+	find "${OUTDIR}"/vendor_bootimg -name '*.dtb' -type f | gawk -F'/' '{print $NF}' | while read -r i; do "${DTC}" -q -s -f -I dtb -O dts -o vendor_bootdts/"${i/\.dtb/.dts}" vendor_bootimg/"${i}"; done 2>/dev/null
+	bash "${UNPACKBOOT}" "${OUTDIR}"/vendor_boot.img "${OUTDIR}"/vendor_boot 2>/dev/null
+	printf "Vendor Boot extracted\n"
+	# extract-ikconfig
+	mkdir -p "${OUTDIR}"/vendor_bootRE
+	# vmlinux-to-elf
+	python3 "${VMLINUX2ELF}" "${OUTDIR}"/vendor_boot.img "${OUTDIR}"/vendor_bootRE/vendor_boot.elf >/dev/null 2>&1
+	printf "vendor_boot.elf generated\n"
+fi
+
 # Extract recovery.img
 if [[ -f "${OUTDIR}"/recovery.img ]]; then
 	bash "${UNPACKBOOT}" "${OUTDIR}"/recovery.img "${OUTDIR}"/recovery 2>/dev/null

utils/unpackboot.sh

@@ -39,11 +39,17 @@ pout "Unpack & decompress $1 to $2"
 cp -f $1 $tempdir/
 cd $tempdir
 bootimg="$(basename $1)"
-offset=$(grep -abo ANDROID! $bootimg | cut -f 1 -d :)
+offset=$(grep -abo "ANDROID!\|VNDRBOOT" $bootimg | cut -f 1 -d :)
 [ -z $offset ] && exit
 if [ $offset -gt 0 ]; then
     dd if=$bootimg of=bootimg bs=$offset skip=1 2>/dev/null
 fi
+header_addr=40
+VNDRBOOT=false
+if grep -qabo VNDRBOOT $bootimg; then
+    VNDRBOOT=true
+    header_addr=8
+fi
 
 kernel_addr=0x$(od -A n -X -j 12 -N 4 $bootimg | sed 's/ //g' | sed 's/^0*//g')
 ramdisk_addr=0x$(od -A n -X -j 20 -N 4 $bootimg | sed 's/ //g' | sed 's/^0*//g')
@@ -58,10 +64,42 @@ dtbo_size=$(od -A n -D -j 1632 -N 4 $bootimg | sed 's/ //g')
 [ $dtbo_size -gt 0 ] && dtbo_addr=0x$(od -A n -X -j 1636 -N 4 $bootimg | sed 's/ //g' | sed -e 's/^0*//g')
 cmd_line=$(od -A n -S1 -j 64 -N 512 $bootimg)
 board=$(od -A n -S1 -j 48 -N 16 $bootimg)
-version=$(od -A n -D -j 40 -N 1 $bootimg | sed 's/ //g')
+version=$(od -A n -D -j $header_addr -N 1 $bootimg | sed 's/ //g')
-if [ $version -gt 1 ]; then
+if [ $version -eq 2 ]; then
     dtb_size=$(od -A n -D -j 1648 -N 4 $bootimg | sed 's/ //g')
     dtb_addr=0x$(od -A n -X -j 1652 -N 4 $bootimg | sed 's/ //g' | sed 's/^0*//g')
+elif [ $version -eq 3 ]; then
+    page_size=4096
+    board=
+    kernel_size=0
+    kernel_addr=
+    second_size=0
+    second_addr=
+    ramdisk_size=
+    ramdisk_addr=
+    cmd_line=
+    tags_addr=
+    dtb_size=0
+    dtb_addr=
+    if [ "$VNDRBOOT" = "true" ]; then
+        kernel_addr=0x$(od -A n -X -j 16 -N 4 $bootimg | sed "s/ //g" | sed "s/^0*//g")
+        ramdisk_addr=0x$(od -A n -X -j 20 -N 4 $bootimg | sed "s/ //g" | sed "s/^0*//g")
+        ramdisk_size=$(od -A n -D -j 24 -N 4 $bootimg | sed "s/ //g")
+        cmd_line=$(od -A n -S1 -j 28 -N 2048 $bootimg)
+        tags_addr=0x$(od -A n -X -j 2076 -N 4 $bootimg | sed "s/ //g" | sed "s/^0*//g")
+        dtb_size=$(od -A n -D -j 2100 -N 4 $bootimg | sed "s/ //g")
+        dtb_addr=0x$(od -A n -X -j 2104 -N 4 $bootimg | sed "s/ //g" | sed "s/^0*//g")
+    else
+        kernel_addr=0x00008000 # To reset the base addr to 0
+        kernel_size=$(od -A n -D -j 8 -N 4 $bootimg | sed "s/ //g")
+        ramdisk_size=$(od -A n -D -j 12 -N 4 $bootimg | sed "s/ //g")
+        cmd_line=$(od -A n -S1 -j 44 -N 1536 $bootimg)
+        os_version=$(od -A n -D -j 16 -N 4 $bootimg | sed "s/ //g")
+	patch_level=$(($os_version & ((1<<11) - 1)))
+        os_version=$(($os_version>>11))
+        os_version=$(($os_version>>14)).$(($os_version>>7 & ((1<<7) - 1))).$(($os_version & ((1<<7) - 1)))
+        patch_level=$((($patch_level>>4) + 2000)):$(($patch_level & ((1<<4) - 1)))
+    fi
 fi
 base_addr=$((kernel_addr-0x00008000))
 kernel_offset=$((kernel_addr-base_addr))
@@ -85,6 +123,14 @@ tags_offset=0x${tags_offset:0-8}
 dtbo_offset=0x${dtbo_offset:0-8}
 dtb_offset=0x${dtb_offset:0-8}
 
+if [ $version -gt 2 ] && [ "$VNDRBOOT" == "false" ]; then
+    tags_offset=
+    ramdisk_offset=
+elif [ "$VNDRBOOT" == "true" ]; then
+    kernel=
+    dtbo_offset=
+fi
+
 k_count=$(((kernel_size+page_size-1)/page_size))
 r_count=$(((ramdisk_size+page_size-1)/page_size))
 s_count=$(((second_size+page_size-1)/page_size))
@@ -132,29 +178,37 @@ rm -f *_tmp $(basename $1) $bootimg
 
 kernel=kernel
 ramdisk=ramdisk
-[ ! -s $kernel ] && exit
+[ "$VNDRBOOT" == "false" ] && [ ! -s $kernel ] && exit
 
 # Print boot.img/recovery.img info
-[ ! -z "$board" ] && pout "  board               : $board"  
+[ ! -z "$board" ] && pout "  board               : $board"
-pout "  kernel              : $kernel"
+[ $version -lt 3 ] || [ "$VNDRBOOT" == "false" ] && \
+	pout "  kernel              : $kernel"
 pout "  ramdisk             : $ramdisk"
 pout "  page size           : $page_size"
-pout "  kernel size         : $kernel_size"
+[ $version -lt 3 ] || [ "$VNDRBOOT" == "false" ] && \
-pout "  ramdisk size        : $ramdisk_size"
+	pout "  kernel size         : $kernel_size" && \
+	pout "  ramdisk size        : $ramdisk_size"
 [ ! -z $second_size ] && [ $second_size -gt 0 ] && \
 	pout "  second_size         : $second_size"
 pout "  base                : $base_addr"
-pout "  kernel offset       : $kernel_offset"
+[ $version -lt 3 ] || [ "$VNDRBOOT" == "true" ] && \
-pout "  ramdisk offset      : $ramdisk_offset"
+	pout "  kernel offset       : $kernel_offset" && \
+	pout "  ramdisk offset      : $ramdisk_offset"
 [ $version -gt 0 ] && [ $dtbo_size -gt 0 ] && pout "  boot header version : $version" && \
 	pout "  dtbo                : $dtbo" && \
 	pout "  dtbo size           : $dtbo_size" && \
 	pout "  dtbo offset         : $dtbo_offset"
 [ $dtb_size -gt 0 ] && pout "  dtb img             : $dt" && \
 	pout "  dtb size            : $dtb_size"
-[ $version -gt 1 ] && pout "  dtb offset          : $dtb_offset"
+[ $version -gt 1 ] && [ "$VNDRBOOT" == "true" ] && \
+	pout "  dtb offset          : $dtb_offset"
 [ ! -z $second_size ] && [ $second_size -gt 0 ] && \
 	pout "  second_offset       : $second_offset"
+[ ! -z $os_version ] || [ ! -z $patch_level ] && \
+	pout "  os_version          : $os_version" && \
+	pout "  os_patch_level      : $patch_level" && \
+	os_data="os_version=$os_version\nos_patch_level=$patch_level\n"
 pout "  tags offset         : $tags_offset"
 pout "  cmd line            : $cmd_line"
 
@@ -164,7 +218,7 @@ escaped_cmd_line=$(echo $cmd_line | sed "s/'/$esq/g")
 # Write info to img_info, decompress ramdisk.packed
 printf "kernel=kernel\nramdisk=ramdisk\n${s_name}page_size=$page_size\n${do_name}${dt_name}\
 kernel_size=$kernel_size\nramdisk_size=$ramdisk_size\n${s_size}${dt_size}base_addr=$base_addr\nkernel_offset=$kernel_offset\n\
-ramdisk_offset=$ramdisk_offset\ntags_offset=$tags_offset\ndtbo_offset=$dtbo_offset\ncmd_line=\'$escaped_cmd_line\'\nboard=\"$board\"\n" > img_info
+ramdisk_offset=$ramdisk_offset\ntags_offset=$tags_offset\ndtbo_offset=$dtbo_offset\n${os_data}cmd_line=\'$escaped_cmd_line\'\nboard=\"$board\"\n" > img_info
 
 # MTK ramdisk (MTK Header Size 512, MAGIC 0x58881688)
 mtk_header_magic="58881688"