mirrors/futurerestore
1
0
Fork 0
mirror of https://github.com/tihmstar/futurerestore.git synced 2025-07-02 15:08:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix manually specifying and veridian devices

Browse source
This commit is contained in:
Cryptiiiic 2022-03-07 15:09:25 -08:00
parent 6406f51650
commit 9fb4d2ca90
No known key found for this signature in database
GPG key ID: 6027B509EFE3A76B
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/linux-bootstrap.sh vendored
View file

@ -9,7 +9,7 @@ apt-get -qq update
apt-get -yqq dist-upgrade apt-get -yqq dist-upgrade
apt-get install --no-install-recommends -yqq zstd curl gnupg2 lsb-release wget software-properties-common build-essential git autoconf automake libtool-bin pkg-config cmake zlib1g-dev libminizip-dev libpng-dev libreadline-dev libbz2-dev libudev-dev libudev1 apt-get install --no-install-recommends -yqq zstd curl gnupg2 lsb-release wget software-properties-common build-essential git autoconf automake libtool-bin pkg-config cmake zlib1g-dev libminizip-dev libpng-dev libreadline-dev libbz2-dev libudev-dev libudev1
cp -RpP /usr/bin/ld / cp -RpP /usr/bin/ld /
rm -rf /usr/bin/ld /usr/lib/x86_64-linux-gnu/lib{usb-1.0,png*}.so* rm -rf /usr/bin/ld /usr/lib/x86_64-linux-gnu/lib{usb-1.0,png*,readline}.so*
cd ${TMPDIR}/Builder/repos/futurerestore cd ${TMPDIR}/Builder/repos/futurerestore
git submodule update --init --recursive git submodule update --init --recursive
cd ${BASE} cd ${BASE}

2
external/idevicerestore vendored

@ -1 +1 @@
Subproject commit b3ac88e2c5c6faeab88eca86bb4ff0f94972d0f7 Subproject commit 6910da2f8d7c4667e89afdacc700006e89c589bd

16
futurerestore/futurerestore.cpp
View file

@ -1548,8 +1548,8 @@ void futurerestore::downloadLatestVeridian() {
} }
if (veridianFWMStr) { if (veridianFWMStr) {
info("downloading Veridian FirmwareMap\n\n"); info("downloading Veridian FirmwareMap\n\n");
retassure(!downloadPartialzip(getLatestFirmwareUrl(), veridianDGMStr, veridianFWMTempPath.c_str()), retassure(!downloadPartialzip(getLatestFirmwareUrl(), veridianFWMStr, veridianFWMTempPath.c_str()),
"could not download Veridian DigestMap\n"); "could not download Veridian FirmwareMap\n");
} }
if (veridianDGMStr && veridianFWMStr) if (veridianDGMStr && veridianFWMStr)
loadVeridian(veridianDGMTempPath, veridianFWMTempPath); loadVeridian(veridianDGMTempPath, veridianFWMTempPath);
@ -1584,9 +1584,9 @@ void futurerestore::downloadLatestBaseband() {
"could not download baseband\n"); "could not download baseband\n");
saveStringToFile(manifeststr, basebandManifestTempPath.c_str()); saveStringToFile(manifeststr, basebandManifestTempPath.c_str());
setBasebandPath(basebandTempPath); setBasebandPath(basebandTempPath);
setBasebandPath(basebandManifestTempPath); setBasebandManifestPath(basebandManifestTempPath);
loadBaseband(basebandTempPath); loadBaseband(this->_basebandPath);
loadBasebandManifest(basebandManifestTempPath); loadBasebandManifest(this->_basebandManifestPath);
} }
void futurerestore::downloadLatestSep() { void futurerestore::downloadLatestSep() {
@ -1594,9 +1594,11 @@ void futurerestore::downloadLatestSep() {
char *pathStr = getPathOfElementInManifest("SEP", manifeststr, getDeviceBoardNoCopy(), 0); char *pathStr = getPathOfElementInManifest("SEP", manifeststr, getDeviceBoardNoCopy(), 0);
info("downloading SEP\n\n"); info("downloading SEP\n\n");
retassure(!downloadPartialzip(getLatestFirmwareUrl(), pathStr, sepTempPath.c_str()), "could not download SEP\n"); retassure(!downloadPartialzip(getLatestFirmwareUrl(), pathStr, sepTempPath.c_str()), "could not download SEP\n");
loadSep(sepTempPath);
saveStringToFile(manifeststr, sepManifestTempPath.c_str()); saveStringToFile(manifeststr, sepManifestTempPath.c_str());
loadSepManifest(sepManifestTempPath); setSepPath(sepTempPath);
setSepManifestPath(sepManifestTempPath);
loadSep(this->_sepPath);
loadSepManifest(this->_sepManifestPath);
} }
void futurerestore::loadSepManifest(std::string sepManifestPath) { void futurerestore::loadSepManifest(std::string sepManifestPath) {

4
futurerestore/main.cpp
View file

@ -350,6 +350,8 @@ int main_r(int argc, const char * argv[]) {
info("user specified to use latest signed SEP\n"); info("user specified to use latest signed SEP\n");
client.downloadLatestSep(); client.downloadLatestSep();
}else if (!client.is32bit()){ }else if (!client.is32bit()){
client.setSepPath(sepPath);
client.setSepManifestPath(sepManifestPath);
client.loadSep(sepPath); client.loadSep(sepPath);
client.loadSepManifest(sepManifestPath); client.loadSepManifest(sepManifestPath);
} }
@ -375,6 +377,8 @@ int main_r(int argc, const char * argv[]) {
client.downloadLatestBaseband(); client.downloadLatestBaseband();
}else{ }else{
client.setBasebandPath(basebandPath); client.setBasebandPath(basebandPath);
client.setBasebandManifestPath(basebandManifestPath);
client.loadBaseband(basebandPath);
client.loadBasebandManifest(basebandManifestPath); client.loadBasebandManifest(basebandManifestPath);
printf("Did set SEP+baseband path and firmware\n"); printf("Did set SEP+baseband path and firmware\n");
} }