diff options
| -rwxr-xr-x | META-INF/com/google/android/update-binary | 553 | ||||
| -rwxr-xr-x | anykernel.sh | 28 | ||||
| -rwxr-xr-x | tools/ak3-core.sh | 25 |
3 files changed, 260 insertions, 346 deletions
diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary index b0b62c1..5704f16 100755 --- a/META-INF/com/google/android/update-binary +++ b/META-INF/com/google/android/update-binary @@ -10,194 +10,126 @@ $BOOTMODE || ps -A 2>/dev/null | grep zygote | grep -v grep >/dev/null && BOOTMO $BOOTMODE && DIR=/sdcard || DIR=$(dirname "$ZIPFILE"); -test -d /postinstall/tmp && POSTINSTALL=/postinstall; -test "$AKHOME" || AKHOME=$POSTINSTALL/tmp/anykernel; test "$ANDROID_ROOT" || ANDROID_ROOT=/system; +test "$home" || home=/tmp/anykernel; ui_print() { until [ ! "$1" ]; do - echo "ui_print $1 - ui_print" >> $OUTFD; + echo -e "ui_print $1\nui_print" > $OUTFD; shift; done; } ui_printfile() { - while IFS='' read -r line || $BB [[ -n "$line" ]]; do + while IFS='' read -r line || $bb [[ -n "$line" ]]; do ui_print "$line"; done < $1; } -show_progress() { echo "progress $1 $2" >> $OUTFD; } -file_getprop() { $BB grep "^$2=" "$1" | $BB cut -d= -f2-; } +show_progress() { echo "progress $1 $2" > $OUTFD; } +file_getprop() { $bb grep "^$2=" "$1" | $bb cut -d= -f2-; } +int2ver() { + if [ "$1" -eq "$1" ] 2>/dev/null; then + echo "$1.0.0"; + elif [ ! "$(echo "$1" | $bb cut -d. -f3)" ]; then + echo "$1.0"; + else + echo "$1"; + fi; +} +cleanup() { + cd $(dirname $home); + rm -rf $home; +} +debugging() { + case $(basename "$ZIPFILE" .zip) in + *-debugging) + ui_print " " "Creating debugging archive in $DIR..."; + test -f /tmp/recovery.log && log=/tmp/recovery.log; + $bb tar -czf "$DIR/anykernel3-$(date +%Y-%m-%d_%H%M%S)-debug.tgz" $home $log; + ;; + esac; +} setup_mountpoint() { - test -L $1 && $BB mv -f $1 ${1}_link; + test -L $1 && $bb mv -f $1 ${1}_link; if [ ! -d $1 ]; then rm -f $1; - mkdir -p $1; + mkdir $1; + fi; +} +is_mounted() { $bb mount | $bb grep -q " $1 "; } +umount_all() { + (if ! $BOOTMODE; then + umount_apex; + $bb umount /system; + $bb umount -l /system; + if [ -e /system_root ]; then + $bb umount /system_root; + $bb umount -l /system_root; + fi; fi; + umount /vendor; + umount -l /vendor; + if [ "$umount_data" ]; then + $bb umount /data; + $bb umount -l /data; + fi) 2>/dev/null; } -is_mounted() { $BB mount | $BB grep -q " $1 "; } mount_apex() { test -d /system/apex || return 1; local apex dest loop minorx num; setup_mountpoint /apex; - test -e /dev/block/loop1 && minorx=$($BB ls -l /dev/block/loop1 | $BB awk '{ print $6 }') || minorx=1; + test -e /dev/block/loop1 && minorx=$(ls -l /dev/block/loop1 | $bb awk '{ print $6 }') || minorx=1; num=0; for apex in /system/apex/*; do - dest=/apex/$($BB basename $apex .apex); + dest=/apex/$(basename $apex .apex); test "$dest" == /apex/com.android.runtime.release && dest=/apex/com.android.runtime; - $BB mkdir -p $dest; + mkdir -p $dest; case $apex in *.apex) - $BB unzip -qo $apex apex_payload.img -d /apex; - $BB mv -f /apex/apex_payload.img $dest.img; - $BB mount -t ext4 -o ro,noatime $dest.img $dest 2>/dev/null; + $bb unzip -qo $apex apex_payload.img -d /apex; + $bb mv -f /apex/apex_payload.img $dest.img; + $bb mount -t ext4 -o ro,noatime $dest.img $dest 2>/dev/null; if [ $? != 0 ]; then while [ $num -lt 64 ]; do loop=/dev/block/loop$num; - ($BB mknod $loop b 7 $((num * minorx)); - $BB losetup $loop $dest.img) 2>/dev/null; + ($bb mknod $loop b 7 $((num * minorx)); + $bb losetup $loop $dest.img) 2>/dev/null; num=$((num + 1)); - $BB losetup $loop | $BB grep -q $dest.img && break; + $bb losetup $loop | $bb grep -q $dest.img && break; done; - $BB mount -t ext4 -o ro,loop,noatime $loop $dest; + $bb mount -t ext4 -o ro,loop,noatime $loop $dest; if [ $? != 0 ]; then - $BB losetup -d $loop 2>/dev/null; + $bb losetup -d $loop 2>/dev/null; fi; fi; ;; - *) $BB mount -o bind $apex $dest;; + *) $bb mount -o bind $apex $dest;; esac; done; export ANDROID_RUNTIME_ROOT=/apex/com.android.runtime; export ANDROID_TZDATA_ROOT=/apex/com.android.tzdata; - export BOOTCLASSPATH=/apex/com.android.runtime/javalib/core-oj.jar:/apex/com.android.runtime/javalib/core-libart.jar:/apex/com.android.runtime/javalib/okhttp.jar:/apex/com.android.runtime/javalib/bouncycastle.jar:/apex/com.android.runtime/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/android.test.base.jar:/system/framework/telephony-ext.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar; + export BOOTCLASSPATH=/apex/com.android.runtime/javalib/core-oj.jar:/apex/com.android.runtime/javalib/core-libart.jar:/apex/com.android.runtime/javalib/okhttp.jar:/apex/com.android.runtime/javalib/bouncycastle.jar:/apex/com.android.runtime/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/android.test.base.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar; } umount_apex() { test -d /apex || return 1; local dest loop; - for dest in $($BB find /apex -type d -mindepth 1 -maxdepth 1); do + for dest in $($bb find /apex -type d -mindepth 1 -maxdepth 1); do if [ -f $dest.img ]; then - loop=$($BB mount | $BB grep $dest | $BB cut -d" " -f1); + loop=$($bb mount | $bb grep $dest | $bb cut -d" " -f1); fi; - ($BB umount -l $dest; - $BB losetup -d $loop) 2>/dev/null; + ($bb umount -l $dest; + $bb losetup -d $loop) 2>/dev/null; done; - $BB rm -rf /apex 2>/dev/null; + rm -rf /apex; unset ANDROID_RUNTIME_ROOT ANDROID_TZDATA_ROOT BOOTCLASSPATH; } -mount_all() { - if ! is_mounted /data; then - $BB mount /data; - UMOUNT_DATA=1; - fi; - $BB mount -o ro -t auto /vendor 2>/dev/null; - setup_mountpoint $ANDROID_ROOT; - if ! is_mounted $ANDROID_ROOT; then - $BB mount -o ro -t auto $ANDROID_ROOT 2>/dev/null; - fi; - case $ANDROID_ROOT in - /system_root) setup_mountpoint /system;; - /system) - if ! is_mounted /system && ! is_mounted /system_root; then - setup_mountpoint /system_root; - $BB mount -o ro -t auto /system_root; - elif [ -f /system/system/build.prop ]; then - setup_mountpoint /system_root; - $BB mount --move /system /system_root; - fi; - if [ $? != 0 ]; then - $BB umount /system; - $BB umount -l /system 2>/dev/null; - test -e /dev/block/bootdevice/by-name/system || local slot=$(getprop ro.boot.slot_suffix 2>/dev/null); - $BB mount -o ro -t auto /dev/block/bootdevice/by-name/system$slot /system_root; - fi; - ;; - esac; - if is_mounted /system_root; then - if [ -f /system_root/build.prop ]; then - $BB mount -o bind /system_root /system; - else - $BB mount -o bind /system_root/system /system; - fi; - fi; - mount_apex; -} -umount_all() { - (umount_apex; - if [ ! -d /postinstall/tmp ]; then - $BB umount /system; - $BB umount -l /system; - if [ -e /system_root ]; then - $BB umount /system_root; - $BB umount -l /system_root; - fi; - fi; - umount /vendor; - umount -l /vendor; - if [ "$UMOUNT_DATA" ]; then - $BB umount /data; - $BB umount -l /data; - fi) 2>/dev/null; -} -setup_env() { - $BOOTMODE && return 1; - $BB mount -o bind /dev/urandom /dev/random; - if [ -L /etc ]; then - setup_mountpoint /etc; - $BB cp -af /etc_link/* /etc; - $BB sed -i 's; / ; /system_root ;' /etc/fstab; - fi; - umount_all; - mount_all; - OLD_LD_PATH=$LD_LIBRARY_PATH; - OLD_LD_PRE=$LD_PRELOAD; - OLD_LD_CFG=$LD_CONFIG_FILE; - unset LD_LIBRARY_PATH LD_PRELOAD LD_CONFIG_FILE; - if [ ! "$(getprop 2>/dev/null)" ]; then - getprop() { - local propdir propfile propval; - for propdir in / /system_root /system /vendor /odm /product; do - for propfile in default.prop build.prop; do - test "$propval" && break 2 || propval="$(file_getprop $propdir/$propfile $1 2>/dev/null)"; - done; - done; - test "$propval" && echo "$propval" || echo ""; - } - elif [ ! "$(getprop ro.build.type 2>/dev/null)" ]; then - getprop() { - ($(which getprop) | $BB grep "$1" | $BB cut -d[ -f3 | $BB cut -d] -f1) 2>/dev/null; - } - fi; -} restore_env() { - $BOOTMODE && return 1; - local dir; - unset -f getprop; - test "$OLD_LD_PATH" && export LD_LIBRARY_PATH=$OLD_LD_PATH; - test "$OLD_LD_PRE" && export LD_PRELOAD=$OLD_LD_PRE; - test "$OLD_LD_CFG" && export LD_CONFIG_FILE=$OLD_LD_CFG; + test "$savedpath" && export LD_LIBRARY_PATH="$savedpath"; + test "$savedpre" && export LD_PRELOAD="$savedpre"; umount_all; - test -L /etc_link && $BB rm -rf /etc/*; - (for dir in /apex /system /system_root /etc; do - if [ -L "${dir}_link" ]; then - rmdir $dir; - $BB mv -f ${dir}_link $dir; - fi; - done; - $BB umount -l /dev/random) 2>/dev/null; -} -debugging() { - case $(basename "$ZIPFILE" .zip) in - *-debugging) - ui_print " " "Creating debugging archive in $DIR..."; - test -f /tmp/recovery.log && local log=/tmp/recovery.log; - $BB tar -czf "$DIR/anykernel3-$(date +%Y-%m-%d_%H%M%S)-debug.tgz" $AKHOME $log; - ;; - esac; -} -cleanup() { - cd $(dirname $AKHOME); - rm -rf $AKHOME; + ($bb mv -f /apex_link /apex; + $bb mv -f /system_link /system; + $bb mv -f /system_root_link /system_root; + $bb umount -l /dev/random) 2>/dev/null; } abort() { ui_print "$@"; @@ -208,10 +140,102 @@ abort() { fi; exit 1; } -do_devicecheck() { - test "$(file_getprop anykernel.sh do.devicecheck)" == 1 || return 1; - local device devicename match product testname vendordevice vendorproduct; - ui_print "Checking device..."; + +show_progress 1.34 4; +ui_print " "; +cleanup; +mkdir -p $home/bin; +cd $home; +unzip -o "$ZIPFILE"; +if [ $? != 0 -o ! "$(ls tools)" ]; then + abort "Unzip failed. Aborting..."; +fi; +for arch32 in x86 arm; do + if [ -d $home/tools/$arch32 ]; then + bb=$home/tools/$arch32/busybox; + chmod 755 $bb; + $bb >/dev/null 2>&1; + if [ $? == 0 ]; then + $bb mv -f $home/tools/$arch32/* $home/tools; + break; + fi; + fi; +done; +bb=$home/tools/busybox; +chmod 755 $bb; +$bb chmod -R 755 tools bin; +$bb --install -s bin; +if [ $? != 0 -o -z "$(ls bin)" ]; then + abort "Busybox setup failed. Aborting..."; +fi; + +ui_print " "; +ui_print "================================= "; +ui_print " "; +ui_print " - $(file_getprop /tmp/anykernel/anykernel.sh kernel.string)"; +ui_print " "; +ui_print "================================= "; +ui_print " "; +if [ -f version ]; then + ui_print " "; + ui_printfile version; + ui_print " "; +fi; +ui_print " - AnyKernel3 by osm0sis "; + +$BOOTMODE || $bb mount -o bind /dev/urandom /dev/random; +umount_all; +setup_mountpoint $ANDROID_ROOT; +if ! is_mounted $ANDROID_ROOT; then + $bb mount -o ro -t auto $ANDROID_ROOT; +fi; +case $ANDROID_ROOT in + /system_root) setup_mountpoint /system;; + /system) + if [ -f /system/system/build.prop ]; then + setup_mountpoint /system_root; + $bb mount --move /system /system_root; + if [ $? != 0 ]; then + $bb umount /system; + $bb umount -l /system 2>/dev/null; + $bb mount -o ro -t auto /dev/block/bootdevice/by-name/system /system_root; + fi; + fi; + ;; +esac; +if is_mounted /system_root; then + $bb mount -o bind /system_root/system /system; +fi; +$bb mount -o ro -t auto /vendor 2>/dev/null; +$BOOTMODE || mount_apex; +if ! is_mounted /data; then + $bb mount /data; + umount_data=1; +fi; + +savedpath="$LD_LIBRARY_PATH"; +savedpre="$LD_PRELOAD"; +unset LD_LIBRARY_PATH; +unset LD_PRELOAD; + +if [ ! "$(getprop 2>/dev/null)" ]; then + getprop() { + local propdir propfile propval; + for propdir in / /system_root /system /vendor /odm /product; do + for propfile in default.prop build.prop; do + test "$propval" && break 2 || propval="$(file_getprop $propdir/$propfile $1 2>/dev/null)"; + done; + done; + test "$propval" && echo "$propval" || echo ""; + } +elif [ ! "$(getprop ro.build.type 2>/dev/null)" ]; then + getprop() { + ($(which getprop) | $bb grep "$1" | $bb cut -d[ -f3 | $bb cut -d] -f1) 2>/dev/null; + } +fi; + +if [ "$(file_getprop anykernel.sh do.devicecheck)" == 1 ]; then + ui_print " - Checking device..."; device=$(getprop ro.product.device 2>/dev/null); product=$(getprop ro.build.product 2>/dev/null); vendordevice=$(getprop ro.product.vendor.device 2>/dev/null); @@ -219,40 +243,30 @@ do_devicecheck() { for testname in $(file_getprop anykernel.sh 'device.name.*'); do for devicename in $device $product $vendordevice $vendorproduct; do if [ "$devicename" == "$testname" ]; then - ui_print "$testname" " "; + ui_print " - Device: $testname"; match=1; break 2; fi; done; done; if [ ! "$match" ]; then - abort " " "Unsupported device. Aborting..."; - fi; -} -int2ver() { - if $BB [ "$1" -eq "$1" ] 2>/dev/null; then - echo "$1.0.0"; - elif [ ! "$(echo "$1" | $BB cut -d. -f3)" ]; then - echo "$1.0"; - else - echo "$1"; + abort " - Unsupported device. Aborting..."; fi; -} -do_versioncheck() { - test "$(file_getprop anykernel.sh supported.versions)" || return 1; - local android_ver hi_ver lo_ver parsed_ver supported supported_ver; - ui_print "Checking Android version..."; - supported_ver=$(file_getprop anykernel.sh supported.versions | $BB tr -d '[:space:]'); +fi; + +supported_ver=$(file_getprop anykernel.sh supported.versions | $bb tr -d '[:space:]'); +if [ "$supported_ver" ]; then + ui_print " - Checking Android version..."; android_ver=$(file_getprop /system/build.prop ro.build.version.release); parsed_ver=$(int2ver $android_ver); - if echo $supported_ver | $BB grep -q '-'; then - lo_ver=$(int2ver "$(echo $supported_ver | $BB cut -d- -f1)"); - hi_ver=$(int2ver "$(echo $supported_ver | $BB cut -d- -f2)"); - if echo -e "$hi_ver\n$lo_ver\n$parsed_ver" | $BB sort -g | $BB grep -n "$parsed_ver" | $BB grep -q '^2:'; then + if echo $supported_ver | $bb grep -q '-'; then + lo_ver=$(int2ver "$(echo $supported_ver | $bb cut -d- -f1)"); + hi_ver=$(int2ver "$(echo $supported_ver | $bb cut -d- -f2)"); + if echo -e "$hi_ver\n$lo_ver\n$parsed_ver" | $bb sort -g | $bb grep -n "$parsed_ver" | $bb grep -q '^2:'; then supported=1; fi; else - for ver in $(echo $supported_ver | $BB sed 's;,; ;g'); do + for ver in $(echo $supported_ver | $bb sed 's;,; ;g'); do if [ "$(int2ver $ver)" == "$parsed_ver" ]; then supported=1; break; @@ -260,181 +274,80 @@ do_versioncheck() { done; fi; if [ "$supported" ]; then - ui_print "$android_ver" " "; + ui_print " - Android Version: $android_ver"; else - abort " " "Unsupported Android version. Aborting..."; + abort " - Unsupported Android version. Aborting..."; fi; -} -do_levelcheck() { - test "$(file_getprop anykernel.sh supported.patchlevels)" || return 1; - local android_lvl hi_lvl lo_lvl parsed_lvl supported_lvl; - ui_print "Checking Android security patch level..."; - supported_lvl=$(file_getprop anykernel.sh supported.patchlevels | $BB grep -oE '[0-9]{4}-[0-9]{2}|-'); +fi; + +supported_lvl=$(file_getprop anykernel.sh supported.patchlevels | $bb grep -oE '[0-9]{4}-[0-9]{2}|-'); +if [ "$supported_lvl" ]; then + ui_print " - Checking Android security patch level..."; android_lvl=$(file_getprop /system/build.prop ro.build.version.security_patch); - parsed_lvl=$(echo $android_lvl | $BB grep -oE '[0-9]{4}-[0-9]{2}'); - if echo $supported_lvl | $BB grep -q '^\-'; then + parsed_lvl=$(echo $android_lvl | $bb grep -oE '[0-9]{4}-[0-9]{2}'); + if echo $supported_lvl | $bb grep -q '^\-'; then lo_lvl=0000-00; - hi_lvl=$(echo $supported_lvl | $BB awk '{ print $2 }'); - elif echo $supported_lvl | $BB grep -q ' - '; then - lo_lvl=$(echo $supported_lvl | $BB awk '{ print $1 }'); - hi_lvl=$(echo $supported_lvl | $BB awk '{ print $3 }'); - elif echo $supported_lvl | $BB grep -q '\-$'; then - lo_lvl=$(echo $supported_lvl | $BB awk '{ print $1 }'); + hi_lvl=$(echo $supported_lvl | $bb awk '{ print $2 }'); + elif echo $supported_lvl | $bb grep -q ' - '; then + lo_lvl=$(echo $supported_lvl | $bb awk '{ print $1 }'); + hi_lvl=$(echo $supported_lvl | $bb awk '{ print $3 }'); + elif echo $supported_lvl | $bb grep -q '\-$'; then + lo_lvl=$(echo $supported_lvl | $bb awk '{ print $1 }'); hi_lvl=9999-99; fi; - if echo -e "$hi_lvl\n$lo_lvl\n$parsed_lvl" | $BB sort -g | $BB grep -n "$parsed_lvl" | $BB grep -q '^2:'; then + if echo -e "$hi_lvl\n$lo_lvl\n$parsed_lvl" | $bb sort -g | $bb grep -n "$parsed_lvl" | $bb grep -q '^2:'; then ui_print "$android_lvl" " "; else - abort " " "Unsupported Android security patch level. Aborting..."; + abort " - Unsupported Android security patch level. Aborting..."; fi; -} -dump_moduleinfo() { -cat <<EOF > $1; -name=AK3 Helper Module -version=$($BB awk '{ print $3 }' $AKHOME/vertmp) $($BB grep -oE '#.[0-9]' $AKHOME/vertmp) -versionCode=1 -author=AnyKernel3 -description=$KERNEL_STRING -EOF -} -dump_moduleremover() { -cat <<'EOF' > $1; -#!/system/bin/sh -MODDIR=${0%/*}; -if [ "$(cat /proc/version)" != "$(cat $MODDIR/version)" ]; then - rm -rf $MODDIR; fi; -EOF -} -do_modules() { - test "$(file_getprop anykernel.sh do.modules)" == 1 || return 1; - local block modcon moddir modtarget module slot umask; - if [ "$(file_getprop anykernel.sh do.systemless)" == 1 ]; then - cd $AKHOME/modules; - ui_print " " "Creating kernel helper Magisk module..."; - if [ -d /data/adb/magisk -a -f $AKHOME/split_img/.magisk ]; then - umask=$(umask); - umask 022; - moddir=/data/adb/modules/ak3-helper; - rm -rf $moddir; - mkdir -p system $moddir; - ($BB mv -f product system; - $BB mv -f vendor system) 2>/dev/null; - $BB cp -rLf * $moddir; - dump_moduleinfo $moddir/module.prop; - dump_moduleremover $moddir/post-fs-data.sh; - cp -f $AKHOME/vertmp $moddir/version; - umask $umask; - else - ui_print "Magisk installation not found. Skipped!"; - fi; - else - cd $AKHOME/modules; - ui_print " " "Pushing modules..."; - if [ -d /dev/block/mapper ]; then - for block in system vendor; do - for slot in "" _a _b; do - $BB blockdev --setrw /dev/block/mapper/$block$slot 2>/dev/null; - done; - done; - fi; - if [ ! -d /postinstall/tmp ]; then - $BB mount -o rw,remount -t auto /system; - $BB mount -o rw,remount -t auto /vendor 2>/dev/null; - fi; - for module in $(find . -name '*.ko'); do - modtarget=$POSTINSTALL$(echo $module | $BB cut -c2-); - if [ ! -e $modtarget ]; then - case $module in - */vendor/*) modcon=vendor;; - *) modcon=system;; - esac; - fi; - if is_mounted $modtarget; then - $BB mount -o rw,remount -t auto $modtarget; - fi; - mkdir -p $(dirname $modtarget); - $BB cp -rLf $module $modtarget; - $BB chown 0:0 $modtarget; - $BB chmod 644 $modtarget; - if [ "$modcon" ]; then - chcon "u:object_r:${modcon}_file:s0" $modtarget; - fi; - if is_mounted $modtarget; then - $BB mount -o ro,remount -t auto $modtarget; - fi; - done; - if [ ! -d /postinstall/tmp ]; then - $BB mount -o ro,remount -t auto /system; - $BB mount -o ro,remount -t auto /vendor 2>/dev/null; - fi; - fi; - cd $AKHOME; -} -show_progress 1.34 4; -ui_print " "; -cleanup; -mkdir -p $AKHOME/bin; -cd $AKHOME; -unzip -o "$ZIPFILE"; -if [ $? != 0 -o ! "$(ls tools)" ]; then - abort "Unzip failed. Aborting..."; -fi; -for ARCH32 in x86 arm; do - if [ -d $AKHOME/tools/$ARCH32 ]; then - BB=$AKHOME/tools/$ARCH32/busybox; - chmod 755 $BB; - $BB >/dev/null 2>&1; - if [ $? == 0 ]; then - $BB mv -f $AKHOME/tools/$ARCH32/* $AKHOME/tools; - break; - fi; - fi; -done; -BB=$AKHOME/tools/busybox; -chmod 755 $BB; -$BB chmod -R 755 tools bin; -$BB --install -s bin; -if [ $? != 0 -o -z "$(ls bin)" ]; then - abort "Busybox setup failed. Aborting..."; -fi; - -if [ -f banner ]; then - ui_printfile banner; - ui_print " " " "; -fi; - -KERNEL_STRING="$(file_getprop anykernel.sh kernel.string)"; -ui_print "$KERNEL_STRING"; -if [ -f version ]; then - ui_print " "; - ui_printfile version; - ui_print " "; -fi; -ui_print " " "AnyKernel3 by osm0sis @ xda-developers" " " " "; - -setup_env; - -do_devicecheck; -do_versioncheck; -do_levelcheck; - -ui_print "Installing..."; -CORE=$($BB grep -oE 'ak.*core.sh' anykernel.sh); -test -f tools/$CORE || $BB ln -s $AKHOME/tools/ak*-core.sh $AKHOME/tools/$CORE; -PATH="$AKHOME/bin:$PATH" home=$AKHOME $BB ash anykernel.sh $2; +ui_print " - Installing kernel..."; +core=$($bb grep -oE 'ak.*core.sh' anykernel.sh); +test -f tools/$core || $bb ln -s $home/tools/ak*-core.sh $home/tools/$core; +PATH="$home/bin:$PATH" home=$home $bb ash anykernel.sh $2; if [ $? != 0 ]; then abort; fi; -do_modules; +if [ "$(file_getprop anykernel.sh do.modules)" == 1 ]; then + ui_print " - Pushing modules..."; + $bb mount -o rw,remount -t auto /system; + $bb mount -o rw,remount -t auto /vendor 2>/dev/null; + cd $home/modules; + for module in $(find . -name '*.ko'); do + modtarget=$(echo $module | $bb cut -c2-); + if [ ! -e $modtarget ]; then + case $module in + */vendor/*) modcon=vendor;; + *) modcon=system;; + esac; + fi; + if is_mounted $modtarget; then + $bb mount -o rw,remount -t auto $modtarget; + fi; + mkdir -p $(dirname $modtarget); + $bb cp -rLf $module $modtarget; + $bb chown 0:0 $modtarget; + $bb chmod 644 $modtarget; + if [ "$modcon" ]; then + chcon "u:object_r:${modcon}_file:s0" $modtarget; + fi; + if is_mounted $modtarget; then + $bb mount -o ro,remount -t auto $modtarget; + fi; + done; + cd $home; + $bb mount -o ro,remount -t auto /system; + $bb mount -o ro,remount -t auto /vendor 2>/dev/null; +fi; debugging; restore_env; if [ "$(file_getprop anykernel.sh do.cleanup)" == 1 ]; then + ui_print " - Cleaning up..."; cleanup; fi; -ui_print " " " " "Done!"; +ui_print " - Done!"; diff --git a/anykernel.sh b/anykernel.sh index 01198ba..45eb297 100755 --- a/anykernel.sh +++ b/anykernel.sh @@ -1,30 +1,40 @@ # AnyKernel3 Ramdisk Mod Script # osm0sis @ xda-developers +## AnyKernel setup +# begin properties properties() { ' -kernel.string=Lavender Custom Kernel +kernel.string=Lavender Custom Kernel for LineageOS do.devicecheck=1 do.modules=0 -do.systemless=1 do.cleanup=1 -do.cleanuponabort=1 -device.name1= -device.name2= -supported.versions= +do.cleanuponabort=0 +device.name1=lavender +supported.versions=9 - 10 supported.patchlevels= -'; } +'; } # end properties # shell variables block=/dev/block/bootdevice/by-name/boot; is_slot_device=0; ramdisk_compression=auto; + ## AnyKernel methods (DO NOT CHANGE) # import patching functions/variables - see for reference . tools/ak3-core.sh; + +## AnyKernel file attributes + + ## AnyKernel install dump_boot; -write_boot; -## end installrite_boot; +# begin ramdisk changes + + +# end ramdisk changes + +write_boot; +## end install diff --git a/tools/ak3-core.sh b/tools/ak3-core.sh index 0d58013..af32439 100755 --- a/tools/ak3-core.sh +++ b/tools/ak3-core.sh @@ -15,8 +15,7 @@ split_img=$home/split_img; # ui_print "<text>" [...] ui_print() { until [ ! "$1" ]; do - echo -e "ui_print $1 - ui_print" >> /proc/self/fd/$OUTFD; + echo -e "ui_print $1\nui_print" > /proc/self/fd/$OUTFD; shift; done; } @@ -244,7 +243,7 @@ flash_boot() { varlist="name arch os type comp addr ep"; elif [ -f "$bin/mkbootimg" -a -f "$bin/unpackelf" -a -f boot.img-base ]; then mv -f cmdline.txt boot.img-cmdline 2>/dev/null; - varlist="cmdline base pagesize kernel_offset ramdisk_offset tags_offset"; + varlist="cmdline base pagesize kerneloff ramdiskoff tagsoff"; fi; for i in $varlist; do if [ -f boot.img-$i ]; then @@ -304,7 +303,7 @@ flash_boot() { $bin/rkcrc -k $ramdisk $home/boot-new.img; elif [ -f "$bin/mkbootimg" -a -f "$bin/unpackelf" -a -f boot.img-base ]; then test "$dt" && dt="--dt $dt"; - $bin/mkbootimg --kernel $kernel --ramdisk $ramdisk --cmdline "$cmdline" --base $home --pagesize $pagesize --kernel_offset $kernel_offset --ramdisk_offset $ramdisk_offset --tags_offset "$tags_offset" $dt --output $home/boot-new.img; + $bin/mkbootimg --kernel $kernel --ramdisk $ramdisk --cmdline "$cmdline" --base $home --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --tags_offset "$tagsoff" $dt --output $home/boot-new.img; else test "$kernel" && cp -f $kernel kernel; test "$ramdisk" && cp -f $ramdisk ramdisk.cpio; @@ -319,7 +318,8 @@ flash_boot() { magisk_patched=$?; fi; if [ $((magisk_patched & 3)) -eq 1 ]; then - ui_print " " "Magisk detected! Patching kernel so reflashing Magisk is not necessary..."; + ui_print " - Magisk detected! Patching kernel"; + ui_print " so reflashing Magisk is not necessary..."; comp=$($bin/magiskboot decompress kernel 2>&1 | grep -v 'raw' | sed -n 's;.*\[\(.*\)\];\1;p'); ($bin/magiskboot split $kernel || $bin/magiskboot decompress $kernel kernel) 2>/dev/null; if [ $? != 0 -a "$comp" ]; then @@ -327,9 +327,6 @@ flash_boot() { $comp -dc $kernel > kernel; fi; $bin/magiskboot hexpatch kernel 736B69705F696E697472616D667300 77616E745F696E697472616D667300; - if [ "$(file_getprop $home/anykernel.sh do.systemless)" == 1 ]; then - strings kernel | grep -E 'Linux version.*#' > $home/vertmp; - fi; if [ "$comp" ]; then $bin/magiskboot compress=$comp kernel kernel.$comp; if [ $? != 0 ]; then @@ -369,16 +366,16 @@ flash_boot() { fi; test $? != 0 && signfail=1; fi; - if [ -f "$bin/boot_signer-dexed.jar" -a -d "$bin/avb" ]; then + if [ -f "$bin/BootSignature_Android.jar" -a -d "$bin/avb" ]; then pk8=$(ls $bin/avb/*.pk8); cert=$(ls $bin/avb/*.x509.*); case $block in *recovery*|*SOS*) avbtype=recovery;; *) avbtype=boot;; esac; - if [ "$(/system/bin/dalvikvm -Xnoimage-dex2oat -cp $bin/boot_signer-dexed.jar com.android.verity.BootSignature -verify boot.img 2>&1 | grep VALID)" ]; then + if [ "$(/system/bin/dalvikvm -Xnoimage-dex2oat -cp $bin/BootSignature_Android.jar com.android.verity.BootSignature -verify boot.img 2>&1 | grep VALID)" ]; then echo "Signing with AVBv1..." >&2; - /system/bin/dalvikvm -Xnoimage-dex2oat -cp $bin/boot_signer-dexed.jar com.android.verity.BootSignature /$avbtype boot-new.img $pk8 $cert boot-new-signed.img; + /system/bin/dalvikvm -Xnoimage-dex2oat -cp $bin/BootSignature_Android.jar com.android.verity.BootSignature /$avbtype boot-new.img $pk8 $cert boot-new-signed.img; fi; fi; if [ $? != 0 -o "$signfail" ]; then @@ -686,9 +683,6 @@ setup_ak() { test "$slot" && slot=_$slot; fi; if [ "$slot" ]; then - if [ -d /postinstall/tmp -a ! "$slot_select" ]; then - slot_select=inactive; - fi; case $slot_select in inactive) case $slot in @@ -753,9 +747,6 @@ setup_ak() { fi; ;; esac; - if [ ! "$no_block_display" ]; then - ui_print "$block"; - fi; } ### |