diff --git a/.github/workflows/linux-bootstrap.sh b/.github/workflows/linux-bootstrap.sh index e6059551..7bfc37cf 100755 --- a/.github/workflows/linux-bootstrap.sh +++ b/.github/workflows/linux-bootstrap.sh @@ -9,7 +9,7 @@ apt-get -qq update 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 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 git submodule update --init --recursive cd ${BASE} diff --git a/external/idevicerestore b/external/idevicerestore index b3ac88e2..6910da2f 160000 --- a/external/idevicerestore +++ b/external/idevicerestore @@ -1 +1 @@ -Subproject commit b3ac88e2c5c6faeab88eca86bb4ff0f94972d0f7 +Subproject commit 6910da2f8d7c4667e89afdacc700006e89c589bd diff --git a/futurerestore/futurerestore.cpp b/futurerestore/futurerestore.cpp index 9113ab6d..054b1b75 100644 --- a/futurerestore/futurerestore.cpp +++ b/futurerestore/futurerestore.cpp @@ -1548,8 +1548,8 @@ void futurerestore::downloadLatestVeridian() { } if (veridianFWMStr) { info("downloading Veridian FirmwareMap\n\n"); - retassure(!downloadPartialzip(getLatestFirmwareUrl(), veridianDGMStr, veridianFWMTempPath.c_str()), - "could not download Veridian DigestMap\n"); + retassure(!downloadPartialzip(getLatestFirmwareUrl(), veridianFWMStr, veridianFWMTempPath.c_str()), + "could not download Veridian FirmwareMap\n"); } if (veridianDGMStr && veridianFWMStr) loadVeridian(veridianDGMTempPath, veridianFWMTempPath); @@ -1584,9 +1584,9 @@ void futurerestore::downloadLatestBaseband() { "could not download baseband\n"); saveStringToFile(manifeststr, basebandManifestTempPath.c_str()); setBasebandPath(basebandTempPath); - setBasebandPath(basebandManifestTempPath); - loadBaseband(basebandTempPath); - loadBasebandManifest(basebandManifestTempPath); + setBasebandManifestPath(basebandManifestTempPath); + loadBaseband(this->_basebandPath); + loadBasebandManifest(this->_basebandManifestPath); } void futurerestore::downloadLatestSep() { @@ -1594,9 +1594,11 @@ void futurerestore::downloadLatestSep() { char *pathStr = getPathOfElementInManifest("SEP", manifeststr, getDeviceBoardNoCopy(), 0); info("downloading SEP\n\n"); retassure(!downloadPartialzip(getLatestFirmwareUrl(), pathStr, sepTempPath.c_str()), "could not download SEP\n"); - loadSep(sepTempPath); saveStringToFile(manifeststr, sepManifestTempPath.c_str()); - loadSepManifest(sepManifestTempPath); + setSepPath(sepTempPath); + setSepManifestPath(sepManifestTempPath); + loadSep(this->_sepPath); + loadSepManifest(this->_sepManifestPath); } void futurerestore::loadSepManifest(std::string sepManifestPath) { diff --git a/futurerestore/main.cpp b/futurerestore/main.cpp index 38a15a82..a222c91f 100644 --- a/futurerestore/main.cpp +++ b/futurerestore/main.cpp @@ -350,6 +350,8 @@ int main_r(int argc, const char * argv[]) { info("user specified to use latest signed SEP\n"); client.downloadLatestSep(); }else if (!client.is32bit()){ + client.setSepPath(sepPath); + client.setSepManifestPath(sepManifestPath); client.loadSep(sepPath); client.loadSepManifest(sepManifestPath); } @@ -375,6 +377,8 @@ int main_r(int argc, const char * argv[]) { client.downloadLatestBaseband(); }else{ client.setBasebandPath(basebandPath); + client.setBasebandManifestPath(basebandManifestPath); + client.loadBaseband(basebandPath); client.loadBasebandManifest(basebandManifestPath); printf("Did set SEP+baseband path and firmware\n"); }