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

Commit 3ad7f43a authored by Frank Preel's avatar Frank Preel
Browse files

Merge branch '411-4a' into 421-emrald-A10

parents 702f37f0 c12fc4e1
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Members:
- Vincent
- Arnau
- Manoj

- Frank

Community:
- Ingo
@@ -37,9 +37,19 @@ Reviewer

developer: 
- [Vincent Bourgmayer](vincent.bourgmayer@e.email)
- Frank Preel
- Israel Yago pereira

## Changelogs
### v0.14.0 (candidate)
- Update Readme
- Update version number to v0.14.0
- Use of the same unit (Mb, Gb..) on the download progress bar
- Add Android Q support for the model below
	- star2lte
	- starlte
-Add emerald support

### v0.13.4-beta (current - unreleased)
- Fix Ubuntu build's docker image - by Israel & Omer Akram & Nicolas
- Refactor classes related to script execution
+5 −0
Original line number Diff line number Diff line
@@ -147,6 +147,11 @@ tasks.jlink {
            from('buildSrc/windows/heimdall')
            into("${buildDir}/image/${appLauncher}-${windowsPlatform}/bin")
            include 'heimdall.exe', 'libusb-1.0.dll', 'libgcc_s_seh-1.dll', 'libstdc++-6.dll', 'libwinpthread-1.dll', 'wdi-simple.exe'
        }
		copy {
            from('buildSrc/windows/heimdall/Drivers')
            into("${buildDir}/image/${appLauncher}-${windowsPlatform}/bin")
            include 'zadig.exe'
        }
        copy {
            from('buildSrc/windows/adb')
+64 −0
Original line number Diff line number Diff line
#!/bin/bash

# Copyright (C) 2022 ECORP SAS - Author: Frank Preel
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program.  If not, see <https://www.gnu.org/licenses/>.

# Parameter
# $1: FASTBOOT_PATH 
# $2: E_IMAGE_PATH need twrp path 
# Exit status
# - 0 : Recovery installed
# - 101 : FASTBOOT_PATH missing
# - 102 : E_IMAGE_PATH missing

#This script performs the same kind of job like `install-e-recovery` on the boot partion (rather than recovery patition)

FASTBOOT_PATH=$1
E_IMAGE_PATH=$2

if [ -z "$FASTBOOT_PATH" ]
then
	echo "Fastboot path is empty"
  	exit 101
fi

if [ -z "$E_IMAGE_PATH" ]
then
	echo "E Image path is empty"
  	exit 102
fi

#"$FASTBOOT_CMD" reboot bootloader
#sleep 10

# Build fastboot and adb commands
FASTBOOT_CMD=${FASTBOOT_PATH}"fastboot"
ADB_CMD=${FASTBOOT_PATH}"adb"

# Wipe user data
#if ! "$FASTBOOT_CMD" erase userdata ;
#then 
#  exit 11
#fi

#echo "user data wiped"
#sleep 1

#if ! "$FASTBOOT_CMD" erase metadata ;
#then 
#  exit 12
#fi

"$FASTBOOT_CMD" flash boot ${E_IMAGE_PATH}
+11 −12
Original line number Diff line number Diff line
@@ -46,18 +46,17 @@ FASTBOOT_CMD=${FASTBOOT_PATH}"fastboot"
ADB_CMD=${FASTBOOT_PATH}"adb"

# Wipe user data
if ! "$FASTBOOT_CMD" erase userdata ;
then 
  exit 11
fi

echo "user data wiped"
sleep 1
#if ! "$FASTBOOT_CMD" erase userdata ;
#then 
#  exit 11
#fi

if ! "$FASTBOOT_CMD" erase metadata ;
then 
  exit 12
fi
#echo "user data wiped"
#sleep 1

#if ! "$FASTBOOT_CMD" erase metadata ;
#then 
#  exit 12
#fi

"$FASTBOOT_CMD" flash boot ${E_IMAGE_PATH}
"$FASTBOOT_CMD" flash recovery ${E_IMAGE_PATH}
+6 −0
Original line number Diff line number Diff line
@@ -56,4 +56,10 @@ ret=${?}
echo "adb sideload retuns = "${ret}
# ret = 0 if adb command is fine, 1 on error

if [ ${ret} -lt 2 ]
then
    echo "handle  adb: failed to read command: Success."
    exit 0
fi

exit ${ret}
Loading