Переглянути джерело

Add kernel_version input for droidspaces action

Added kernel_version input to allow conditional patching based on the specified kernel version.
jimsterino98 4 місяців тому
батько
коміт
bf9bb4df36
1 змінених файлів з 11 додано та 1 видалено
  1. 11 1
      .github/actions/droidspaces/action.yml

+ 11 - 1
.github/actions/droidspaces/action.yml

@@ -1,5 +1,9 @@
 name: add droidspaces
 description: apply patches and configs for droidspaces support
+inputs:
+ kernel_version:
+  description: 'Kernel version (5.10)'
+  required: true
 
 runs:
  using: composite
@@ -9,7 +13,13 @@ runs:
     run: |
      cd "$COMMON"
      # ABI: use ABI padding for SYSVIPC This commit allows us to enable CONFIG_SYSVIPC in defconfig without breaking kernel ABI
-     patch -p1 --forward < "$KERNEL_PATCHES/common/droidspaces/fix_sysvipc_kabi_6_7_8.patch"
+     patch -p1 < "$KERNEL_PATCHES/common/droidspaces/fix_sysvipc_kabi_6_7_8.patch"
+
+     if [[ "${{ inputs.kernel_version }}" == "5.10" ]]; then
+      patch -p1 < "$KERNEL_PATCHES/common/droidspaces/fix_abi_padding_for_posix_mqueue.patch"
+     fi
+
+     patch -p1 < "$KERNEL_PATCHES/common/droidspaces/harden_find_task_by_vpid.patch"
 
      cd "$GITHUB_WORKSPACE"
      cat >> "$GKI_DEFCONFIG" << 'EOF'