duff/anykernel3-rhode
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AK3: separate dump failure and split failure

Browse Source
This commit is contained in:
osm0sis committed 2023-10-09 11:52:12 -03:00
1 parent f1e1a32c60
commit 82adc2f4df
2 files changed
+10 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

META-INF/com/google/android/updater-script
+1 -1
View File
@@ -3,4 +3,4 @@
# Dummy file; update-binary is a shell script (DO NOT CHANGE) # Dummy file; update-binary is a shell script (DO NOT CHANGE)
# #
# #
# AK_BASE_VERSION=20230920 # AK_BASE_VERSION=20231009
tools/ak3-core.sh
+9 -7
View File
@@ -66,7 +66,7 @@ set_perm_recursive() {
### dump_boot functions: ### dump_boot functions:
# split_boot (dump and split image only) # split_boot (dump and split image only)
split_boot() { split_boot() {
local dumpfail; local splitfail;
if [ ! -e "$(echo $block | cut -d\ -f1)" ]; then if [ ! -e "$(echo $block | cut -d\ -f1)" ]; then
abort "Invalid partition. Aborting..."; abort "Invalid partition. Aborting...";
@@ -82,7 +82,9 @@ split_boot() {
else else
dd if=$block of=$bootimg $customdd; dd if=$block of=$bootimg $customdd;
fi; fi;
[ $? != 0 ] && dumpfail=1; if [ $? != 0 ]; then
abort "Dumping image failed. Aborting...";
fi;
mkdir -p $split_img; mkdir -p $split_img;
cd $split_img; cd $split_img;
@@ -92,7 +94,7 @@ split_boot() {
$bin/elftool unpack -i $bootimg -o elftool_out; $bin/elftool unpack -i $bootimg -o elftool_out;
fi; fi;
$bin/unpackelf -i $bootimg; $bin/unpackelf -i $bootimg;
[ $? != 0 ] && dumpfail=1; [ $? != 0 ] && splitfail=1;
mv -f boot.img-kernel kernel.gz; mv -f boot.img-kernel kernel.gz;
mv -f boot.img-ramdisk ramdisk.cpio.gz; mv -f boot.img-ramdisk ramdisk.cpio.gz;
mv -f boot.img-cmdline cmdline.txt 2>/dev/null; mv -f boot.img-cmdline cmdline.txt 2>/dev/null;
@@ -119,7 +121,7 @@ split_boot() {
grep "Address:" header | cut -c15- > boot.img-addr; grep "Address:" header | cut -c15- > boot.img-addr;
grep "Point:" header | cut -c15- > boot.img-ep; grep "Point:" header | cut -c15- > boot.img-ep;
$bin/dumpimage -p 0 -o kernel.gz boot-trimmed.img; $bin/dumpimage -p 0 -o kernel.gz boot-trimmed.img;
[ $? != 0 ] && dumpfail=1; [ $? != 0 ] && splitfail=1;
case $(cat boot.img-type) in case $(cat boot.img-type) in
Multi) $bin/dumpimage -p 1 -o ramdisk.cpio.gz boot-trimmed.img;; Multi) $bin/dumpimage -p 1 -o ramdisk.cpio.gz boot-trimmed.img;;
RAMDisk) mv -f kernel.gz ramdisk.cpio.gz;; RAMDisk) mv -f kernel.gz ramdisk.cpio.gz;;
@@ -129,13 +131,13 @@ split_boot() {
else else
(set -o pipefail; $bin/magiskboot unpack -h $bootimg 2>&1 | tee infotmp >&2); (set -o pipefail; $bin/magiskboot unpack -h $bootimg 2>&1 | tee infotmp >&2);
case $? in case $? in
1) dumpfail=1;; 1) splitfail=1;;
2) touch chromeos;; 2) touch chromeos;;
esac; esac;
fi; fi;
if [ $? != 0 -o "$dumpfail" ]; then if [ $? != 0 -o "$splitfail" ]; then
abort "Dumping/splitting image failed. Aborting..."; abort "Splitting image failed. Aborting...";
fi; fi;
cd $home; cd $home;
} }