refactor: apply patch in the order of patch number

A dedicated python script is also introduced to handle the patch applying logic.

Author: Locietta

apply-patches.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+
+import argparse
+import os, subprocess
+
+# accept patch dir and branch name as arguments
+def parse_args():
+    parser = argparse.ArgumentParser(description="Apply patches to a git repository.")
+    parser.add_argument("patch_dir", type=str, help="Directory containing the patch files.")
+    parser.add_argument("branch_name", type=str, help="Name of the branch to apply patches to.")
+    return parser.parse_args()
+
+def main():
+    args = parse_args()
+    patch_dir = args.patch_dir
+    branch_name = args.branch_name
+
+    print(f"Using patch directory: {patch_dir}")
+    print(f"Using branch name: {branch_name}")
+
+    common_patch_dir = patch_dir
+    branch_specific_patch_dir = f"{patch_dir}/{branch_name}"
+
+    # collect all patch files from the two directories
+    # into a dict [patch_file_name: patch_file_path]
+    patch_files = {}
+    for dir_path in [common_patch_dir, branch_specific_patch_dir]:
+        if os.path.exists(dir_path):
+            for file_name in os.listdir(dir_path):
+                if file_name.endswith(".patch"):
+                    patch_files[file_name] = os.path.join(dir_path, file_name)
+
+    # sort patch files by name
+    sorted_patch_files = sorted(patch_files.items())
+    for file_name, file_path in sorted_patch_files:
+        print(f"Applying patch: {file_name}")
+        # apply the patch using git
+        result = subprocess.run(["git", "apply", file_path], check=False)
+        if result.returncode != 0:
+            print(f"Failed to apply patch, halting build!")
+            exit(1)
+
+
+
+if __name__ == "__main__":
+    main()

setup.sh

@@ -79,31 +79,7 @@ fi
 
 cd linux
 PATCH_DIR=${PATCH_DIR:-"../patches"}
-
-# Determine the patch directory
-if [[ $BRANCH == "LTS" ]]; then
-  SPESIFIC_PATCH_DIR="$PATCH_DIR/LTS"
-else
-  SPESIFIC_PATCH_DIR="$PATCH_DIR/MAIN"
-fi
-
-function loop_apply_patch {
-  for patch_file in "$1/"*.patch; do
-    git apply "$patch_file"
-
-    if [ $? != 0 ]; then
-      echo -e "Failed to apply $patch_file"
-      echo -e "Halting build!"
-      exit 1
-    fi
-  done
-}
-
-# Apply common patches
-loop_apply_patch $PATCH_DIR
-# Apply LTS/MAIN specific patches
-loop_apply_patch $SPESIFIC_PATCH_DIR
-
+../apply_patches.py "$PATCH_DIR" "$BRANCH"
 cp ../wsl2_defconfig.$BRANCH ./arch/x86/configs/wsl2_defconfig
 
 make LLVM=1 LLVM_IAS=1 wsl2_defconfig