pipa: vendorsetup: clean up and add fw check
Signed-off-by: Abdulwahab Isam <abdoi94.iq@gmail.com>
This commit is contained in:
Abdulwahab Isam
188
vendorsetup.sh
188
vendorsetup.sh
@@ -7,186 +7,128 @@ clone_if_missing() {
|
||||
local target_dir=$3
|
||||
|
||||
if [ ! -d "$target_dir" ]; then
|
||||
echo "Cloning $repo_url to $target_dir"
|
||||
git clone "$repo_url" -b "$branch" "$target_dir"
|
||||
else
|
||||
echo "$target_dir already exists, skipping clone"
|
||||
echo "Cloning $target_dir..."
|
||||
git clone "$repo_url" -b "$branch" "$target_dir" -q
|
||||
echo "Done."
|
||||
fi
|
||||
}
|
||||
|
||||
# Git clones
|
||||
echo "Setting up repositories..."
|
||||
clone_if_missing "https://github.com/ai94iq/android_device_xiaomi_sm8250-common" "axv-qpr2" "device/xiaomi/sm8250-common"
|
||||
clone_if_missing "https://github.com/ai94iq/android_kernel_xiaomi_sm8250" "axksu" "kernel/xiaomi/sm8250"
|
||||
clone_if_missing "https://github.com/ai94iq/proprietary_vendor_xiaomi_sm8250-common" "axv-qpr2" "vendor/xiaomi/sm8250-common"
|
||||
clone_if_missing "https://github.com/ai94iq/proprietary_vendor_xiaomi_pipa" "axv-qpr2" "vendor/xiaomi/pipa"
|
||||
|
||||
# Additional LineageOS repositories
|
||||
# Additional repos
|
||||
clone_if_missing "https://github.com/LineageOS/android_hardware_xiaomi" "lineage-22.2" "hardware/xiaomi"
|
||||
clone_if_missing "https://github.com/LineageOS/android_hardware_lineage_compat" "lineage-22.2" "hardware/lineage/compat"
|
||||
clone_if_missing "https://github.com/LineageOS/android_hardware_lineage_interfaces" "lineage-22.2" "hardware/lineage/interfaces"
|
||||
clone_if_missing "https://github.com/LineageOS/android_hardware_lineage_livedisplay" "lineage-22.2" "hardware/lineage/livedisplay"
|
||||
|
||||
# Additional 3rd-Party repositories
|
||||
clone_if_missing "https://github.com/ai94iq/android_packages_apps_XiaomiDolby" "lineage-22.2" "packages/apps/XiaomiDolby"
|
||||
|
||||
# Function for applying patches with enhanced handling
|
||||
apply_atomic_recovery_patch() {
|
||||
# Apply recovery patch
|
||||
apply_recovery_patch() {
|
||||
local root_dir=$(pwd)
|
||||
local target_dir="bootable/recovery"
|
||||
local patch_path="${root_dir}/device/xiaomi/pipa/source-patches/atomic-recovery.diff"
|
||||
|
||||
echo "==== Applying atomic-recovery patch ===="
|
||||
echo "Applying recovery patch..."
|
||||
|
||||
# Check if patch file exists
|
||||
if [ ! -f "$patch_path" ]; then
|
||||
echo "Error: atomic-recovery.diff patch file not found"
|
||||
echo "Please check if the file exists at: ${patch_path}"
|
||||
echo "Error: Patch file not found: ${patch_path}"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Create a temporary copy of the patch file with Unix line endings
|
||||
local temp_patch=$(mktemp)
|
||||
echo "Normalizing patch line endings..."
|
||||
tr -d '\r' < "$patch_path" > "$temp_patch"
|
||||
# Fix line endings and move to target dir
|
||||
cd "$target_dir" || return 1
|
||||
tr -d '\r' < "$patch_path" > /tmp/atomic-recovery.patch
|
||||
|
||||
# Enter target directory
|
||||
echo "Navigating to ${target_dir}..."
|
||||
if ! cd "$target_dir"; then
|
||||
echo "Error: Could not change to $target_dir directory"
|
||||
rm "$temp_patch"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo "Applying atomic-recovery patch..."
|
||||
|
||||
# Save the current state
|
||||
local current_state=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || git rev-parse HEAD)
|
||||
|
||||
# Try applying with git am first
|
||||
echo "Trying git am with --3way option..."
|
||||
if git am --3way "$temp_patch" 2>/dev/null; then
|
||||
echo "✓ Patch applied successfully using git am"
|
||||
rm "$temp_patch"
|
||||
cd "$root_dir"
|
||||
return 0
|
||||
fi
|
||||
git am --abort 2>/dev/null || true
|
||||
|
||||
# Try git apply
|
||||
echo "Trying git apply with ignore-whitespace..."
|
||||
if git apply --check --ignore-whitespace "$temp_patch" 2>/dev/null &&
|
||||
git apply --ignore-whitespace "$temp_patch"; then
|
||||
echo "✓ Patch applied successfully using git apply"
|
||||
# Try different patch methods
|
||||
if git am --3way /tmp/atomic-recovery.patch 2>/dev/null; then
|
||||
echo "Patch applied successfully."
|
||||
elif git apply --check --ignore-whitespace /tmp/atomic-recovery.patch 2>/dev/null &&
|
||||
git apply --ignore-whitespace /tmp/atomic-recovery.patch; then
|
||||
git add .
|
||||
git commit -m "Applied atomic-recovery patch"
|
||||
rm "$temp_patch"
|
||||
cd "$root_dir"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Try patch command with various strip levels
|
||||
echo "Trying patch utility with various strip levels..."
|
||||
for level in 1 0 2 3; do
|
||||
if patch -p${level} --ignore-whitespace --no-backup-if-mismatch < "$temp_patch" 2>/dev/null; then
|
||||
echo "✓ Patch applied successfully using patch -p${level}"
|
||||
git commit -m "Applied recovery patch" -q
|
||||
echo "Patch applied successfully."
|
||||
else
|
||||
# Try standard patch with different strip levels
|
||||
for level in 1 0 2; do
|
||||
if patch -p${level} --ignore-whitespace --no-backup-if-mismatch < /tmp/atomic-recovery.patch 2>/dev/null; then
|
||||
git add .
|
||||
git commit -m "Applied recovery patch" -q
|
||||
echo "Patch applied successfully."
|
||||
rm /tmp/atomic-recovery.patch
|
||||
cd "$root_dir"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
|
||||
# Last resort: try partial application
|
||||
patch -p1 --forward --ignore-whitespace --no-backup-if-mismatch < /tmp/atomic-recovery.patch >/dev/null 2>&1 || true
|
||||
if git diff --name-only | grep -q .; then
|
||||
git add .
|
||||
git commit -m "Applied atomic-recovery patch"
|
||||
rm "$temp_patch"
|
||||
cd "$root_dir"
|
||||
return 0
|
||||
git commit -m "Applied recovery patch (partial)" -q
|
||||
echo "Patch partially applied."
|
||||
else
|
||||
echo "Failed to apply patch."
|
||||
git reset --hard HEAD >/dev/null 2>&1
|
||||
fi
|
||||
done
|
||||
|
||||
# Try partial application
|
||||
echo "Attempting partial patch application..."
|
||||
patch -p1 --forward --verbose --ignore-whitespace --no-backup-if-mismatch < "$temp_patch" || true
|
||||
|
||||
# Check if any changes were made
|
||||
if git diff --name-only | grep -q .; then
|
||||
echo "✓ Partial application of atomic-recovery patch succeeded"
|
||||
git add .
|
||||
git commit -m "Applied atomic-recovery patch (partial)"
|
||||
rm "$temp_patch"
|
||||
cd "$root_dir"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "✗ Failed to apply atomic-recovery patch after all attempts"
|
||||
|
||||
# Cleanup
|
||||
git reset --hard HEAD 2>/dev/null || true
|
||||
rm "$temp_patch"
|
||||
rm /tmp/atomic-recovery.patch
|
||||
cd "$root_dir"
|
||||
return 1
|
||||
}
|
||||
|
||||
# Function to download and extract Mi Pad 6 firmware
|
||||
download_and_extract_firmware() {
|
||||
# Download and extract firmware
|
||||
setup_firmware() {
|
||||
local root_dir=$(pwd)
|
||||
local firmware_url="https://github.com/ai94iq/proprietary_vendor_xiaomi_pipa/releases/download/fw-radio-OS2.0.2.0.UMZMIXM/vendor-pipa-fw-included.zip"
|
||||
local target_dir="${root_dir}/vendor/xiaomi"
|
||||
local temp_zip="/tmp/pipa_firmware.zip"
|
||||
local radio_dir="${target_dir}/pipa/radio"
|
||||
|
||||
echo "==== Downloading and extracting Mi Pad 6 firmware ===="
|
||||
# Check if firmware already exists
|
||||
if [ -d "$radio_dir" ] && [ -f "${radio_dir}/abl.img" ] && [ -f "${radio_dir}/xbl.img" ]; then
|
||||
echo "Firmware already present, skipping download."
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Create target directory if it doesn't exist
|
||||
echo "Downloading firmware..."
|
||||
mkdir -p "$target_dir"
|
||||
|
||||
# Download firmware zip
|
||||
echo "Downloading firmware from GitHub..."
|
||||
if ! curl -L "$firmware_url" -o "$temp_zip"; then
|
||||
curl -sL "$firmware_url" -o "$temp_zip"
|
||||
if [ ! -s "$temp_zip" ]; then
|
||||
echo "Error: Failed to download firmware"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Check if download was successful
|
||||
if [ ! -f "$temp_zip" ] || [ ! -s "$temp_zip" ]; then
|
||||
echo "Error: Downloaded firmware file is empty or doesn't exist"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Extract firmware to vendor/xiaomi
|
||||
echo "Extracting firmware to ${target_dir}..."
|
||||
if ! unzip -o "$temp_zip" -d "$target_dir"; then
|
||||
echo "Error: Failed to extract firmware"
|
||||
rm -f "$temp_zip"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Clean up
|
||||
echo "Extracting firmware..."
|
||||
unzip -qo "$temp_zip" -d "$target_dir"
|
||||
rm -f "$temp_zip"
|
||||
echo "✓ Firmware successfully downloaded and extracted"
|
||||
return 0
|
||||
echo "Firmware setup complete."
|
||||
}
|
||||
|
||||
# Main script execution starts here
|
||||
# Main script execution
|
||||
ROOT_DIR=$(pwd)
|
||||
DEVICE_PATH="${ROOT_DIR}/device/xiaomi/pipa"
|
||||
|
||||
# Check if the device repository exists
|
||||
# Check if device directory exists
|
||||
if [ ! -d "$DEVICE_PATH" ]; then
|
||||
echo "Error: Device directory not found at ${DEVICE_PATH}"
|
||||
echo "Please ensure all repositories are properly cloned"
|
||||
echo "Error: Device directory not found. Please ensure repositories are properly cloned."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Create the patches directory if it doesn't exist
|
||||
PATCHES_DIR="${DEVICE_PATH}/source-patches"
|
||||
mkdir -p "$PATCHES_DIR"
|
||||
# Create patches directory
|
||||
mkdir -p "${DEVICE_PATH}/source-patches"
|
||||
|
||||
# Apply patches one by one, ensuring we return to ROOT_DIR between each
|
||||
echo "==== Starting patch application process ===="
|
||||
|
||||
# Apply atomic-recovery patch
|
||||
apply_atomic_recovery_patch
|
||||
|
||||
# Make sure we're in the root directory
|
||||
# Apply patches
|
||||
apply_recovery_patch
|
||||
cd "$ROOT_DIR"
|
||||
|
||||
# Download and extract firmware package
|
||||
download_and_extract_firmware
|
||||
|
||||
# Make sure we're in the root directory
|
||||
# Setup firmware
|
||||
setup_firmware
|
||||
cd "$ROOT_DIR"
|
||||
|
||||
echo "==== Patch application complete ===="
|
||||
echo "Setup complete."
|
||||
|
||||
Reference in New Issue
Block a user