Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 107d9d97 authored by Frank Preel's avatar Frank Preel Committed by Nicolas Gelot
Browse files

Murena security patch from downloaded info file

parent 5a0a2829

flash-scripts/linux/fp4_check_bootloader.sh

+6 −1
Original line number Diff line number Diff line
@@ -41,12 +41,17 @@ echo "Model="$device_model 


SECURITY_PATCH=${ARCHIVE_FOLDER_PATH}""${device_model}"-security-patch"

ORIGINAL_SECURITY_PATCH=$(cat "$SECURITY_PATCH")

MURENA_ROM_INFO=${ARCHIVE_FOLDER_PATH}""{device_model}"-rom-info"



MURENA__SECURITY_PATCH=`sed -n 's/^ro.build.version.security_patch=//p' $MURENA_ROM_INFO`

echo "MURENA__SECURITY_PATCH=$MURENA__SECURITY_PATCH"



# ---------

# Assuming format is xxxx-yy-zz with otional extra info ..

function versionToInt { printf "%03d%03d%03d%03d" $(echo "$1" | tr '-' ' '); }



I_ORIGINAL_SECURITY_PATCH=$(versionToInt "$ORIGINAL_SECURITY_PATCH")

I_MURENA__SECURITY_PATCH=$(versionToInt 2021-12-05)

I_MURENA__SECURITY_PATCH=$(versionToInt $MURENA__SECURITY_PATCH)



if [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

then

flash-scripts/linux/fp4_lock.sh

+3 −1
Original line number Diff line number Diff line
@@ -43,12 +43,14 @@ echo "Model="$device_model 


SECURITY_PATCH=${ARCHIVE_FOLDER_PATH}""${device_model}"-security-patch"

ORIGINAL_SECURITY_PATCH=$(cat "$SECURITY_PATCH")

MURENA__SECURITY_PATCH=`sed -n 's/^ro.build.version.security_patch=//p' $MURENA_ROM_INFO`

echo "MURENA__SECURITY_PATCH=$MURENA__SECURITY_PATCH"



# Assuming format is xxxx-yy-zz with otional extra info ..

function versionToInt { printf "%03d%03d%03d%03d" $(echo "$1" | tr '-' ' '); }



I_ORIGINAL_SECURITY_PATCH=$(versionToInt "$ORIGINAL_SECURITY_PATCH")

I_MURENA__SECURITY_PATCH=$(versionToInt 2021-12-05)

I_MURENA__SECURITY_PATCH=$(versionToInt $MURENA__SECURITY_PATCH)



if [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

then

flash-scripts/linux/fp4_lock_critical.sh

+3 −1
Original line number Diff line number Diff line
@@ -42,12 +42,14 @@ echo "Model="$device_model 


SECURITY_PATCH=${ARCHIVE_FOLDER_PATH}""${device_model}"-security-patch"

ORIGINAL_SECURITY_PATCH=$(cat "$SECURITY_PATCH")

MURENA__SECURITY_PATCH=`sed -n 's/^ro.build.version.security_patch=//p' $MURENA_ROM_INFO`

echo "MURENA__SECURITY_PATCH=$MURENA__SECURITY_PATCH"



# Assuming format is xxxx-yy-zz with otional extra info ..

function versionToInt { printf "%03d%03d%03d%03d" $(echo "$1" | tr '-' ' '); }



I_ORIGINAL_SECURITY_PATCH=$(versionToInt "$ORIGINAL_SECURITY_PATCH")

I_MURENA__SECURITY_PATCH=$(versionToInt 2021-12-05)

I_MURENA__SECURITY_PATCH=$(versionToInt $MURENA__SECURITY_PATCH)



if [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

then

flash-scripts/linux/store-rom-info.sh

+7 −0
Original line number Diff line number Diff line
@@ -46,10 +46,17 @@ fi 


SECURITY_PATCH=${ARCHIVE_FOLDER_PATH}""${device_model}"-security-patch"

DEVICE_STATE=${ARCHIVE_FOLDER_PATH}""${device_model}"-device-state"

MURENA_ROM_INFO=${ARCHIVE_FOLDER_PATH}""${device_model}"-rom-info"



# The command below may provide  empty result if the key does not exists

# In that case the process will use for compare.

"$ADB_PATH" shell getprop ro.build.version.security_patch> $SECURITY_PATCH



wget https://images.ecloud.global/stable/FP4/e-latest-FP4.zip.prop -O $MURENA_ROM_INFO



MURENA__SECURITY_PATCH=`sed -n 's/^ro.build.version.security_patch=//p' $MURENA_ROM_INFO`

echo "MURENA__SECURITY_PATCH=$MURENA__SECURITY_PATCH"



# For FP4 on stock ROM the key [ro.build.device] is [FP4] let's use this to check if we are on stock ROM

# On Murena OS the return is empty

flash-scripts/linux/wait-fastboot-locked.sh

+3 −1
Original line number Diff line number Diff line
@@ -41,12 +41,14 @@ echo "Model="$device_model 


SECURITY_PATCH=${ARCHIVE_FOLDER_PATH}""${device_model}"-security-patch"

ORIGINAL_SECURITY_PATCH=$(cat "$SECURITY_PATCH")

MURENA__SECURITY_PATCH=`sed -n 's/^ro.build.version.security_patch=//p' $MURENA_ROM_INFO`

echo "MURENA__SECURITY_PATCH=$MURENA__SECURITY_PATCH"



# Assuming format is xxxx-yy-zz with otional extra info ..

function versionToInt { printf "%03d%03d%03d%03d" $(echo "$1" | tr '-' ' '); }



I_ORIGINAL_SECURITY_PATCH=$(versionToInt "$ORIGINAL_SECURITY_PATCH")

I_MURENA__SECURITY_PATCH=$(versionToInt 2021-12-05)

I_MURENA__SECURITY_PATCH=$(versionToInt $MURENA__SECURITY_PATCH)



if [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

then