mirror of
https://github.com/tihmstar/futurerestore.git
synced 2025-04-20 14:31:41 +00:00
Fix -u update mode?
This commit is contained in:
parent
281df3c074
commit
f62f74156e
1
.github/workflows/linux-bootstrap.sh
vendored
1
.github/workflows/linux-bootstrap.sh
vendored
|
@ -25,6 +25,7 @@ curl -sO https://cdn.cryptiiiic.com/deps/static/Linux/x86_64/Linux_x86_64_Releas
|
|||
curl -sO https://cdn.cryptiiiic.com/deps/static/Linux/x86_64/Linux_x86_64_Debug_Latest.tar.zst &
|
||||
curl -sLO https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2-linux-x86_64.tar.gz &
|
||||
wait
|
||||
rm -rf ${DEP_ROOT}/{lib,include} || true
|
||||
mkdir -p ${DEP_ROOT}/Linux_x86_64_{Release,Debug}
|
||||
tar xf Linux_x86_64_Release_Latest.tar.zst -C ${DEP_ROOT}/Linux_x86_64_Release &
|
||||
tar xf Linux_x86_64_Debug_Latest.tar.zst -C ${DEP_ROOT}/Linux_x86_64_Debug &
|
||||
|
|
1
.github/workflows/mac-bootstrap.sh
vendored
1
.github/workflows/mac-bootstrap.sh
vendored
|
@ -19,6 +19,7 @@ echo "${PROCURSUS}/libexec/gnubin" | sudo tee /etc/paths1
|
|||
cat /etc/paths | sudo tee -a /etc/paths1
|
||||
sudo mv /etc/paths{1,}
|
||||
wait
|
||||
rm -rf ${DEP_ROOT}/{lib,include} || true
|
||||
mkdir -p ${DEP_ROOT}/macOS_x86_64_Release ${DEP_ROOT}/macOS_x86_64_Debug ${DEP_ROOT}/macOS_arm64_Release ${DEP_ROOT}/macOS_arm64_Debug
|
||||
gtar xf macOS_x86_64_Release_Latest.tar.zst -C ${DEP_ROOT}/macOS_x86_64_Release &
|
||||
gtar xf macOS_x86_64_Debug_Latest.tar.zst -C ${DEP_ROOT}/macOS_x86_64_Debug &
|
||||
|
|
|
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.22)
|
|||
find_package(PkgConfig REQUIRED)
|
||||
set(ignoreMe "${NO_PKGCFG}")
|
||||
set(SUBPROJECT_BUILD 1)
|
||||
if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin")
|
||||
if("${CMAKE_HOST_SYSTEM_NAME}" MATCHES "Darwin")
|
||||
if(NOT DEFINED NO_XCODE AND NOT DEFINED ENV{NO_XCODE})
|
||||
execute_process(COMMAND xcrun --find clang WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE CC OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
execute_process(COMMAND xcrun --find clang++ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
@ -29,7 +29,8 @@ if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin")
|
|||
endif()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch ${ARCH} -isysroot ${SYSROOT} ${MINVER} -fembed-bitcode=off -flto=thin -pthread -mrelax-all -std=gnu++20")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch ${ARCH} -isysroot ${SYSROOT} ${MINVER} -fembed-bitcode=off -flto=thin -pthread -mrelax-all -std=gnu17")
|
||||
elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
|
||||
# set(CMAKE_C_LINK_LIBRARY_FLAG "-fsanitize=address")
|
||||
elseif("${CMAKE_HOST_SYSTEM_NAME}" MATCHES "Linux")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--allow-multiple-definition -pthread")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--allow-multiple-definition -pthread")
|
||||
endif()
|
||||
|
|
0
dep_root/include/.keep
Normal file
0
dep_root/include/.keep
Normal file
0
dep_root/lib/.keep
Normal file
0
dep_root/lib/.keep
Normal file
|
@ -923,6 +923,7 @@ void futurerestore::doRestore(const char *ipsw) {
|
|||
retassure(!ipsw_extract_build_manifest(client->ipsw, &buildmanifest, &unused),
|
||||
"ERROR: Unable to extract BuildManifest from %s. Firmware file might be corrupt.\n", client->ipsw);
|
||||
}
|
||||
client->build_manifest = plist_copy(buildmanifest);
|
||||
|
||||
/* check if device type is supported by the given build manifest */
|
||||
retassure(!build_manifest_check_compatibility(buildmanifest, client->device->product_type),
|
||||
|
|
Loading…
Reference in a new issue