Просмотр исходного кода

fix(ntsync): uncomment prerequisite lockdep patches (0001, 0002) for older sublevels

Patches 0001 (lockdep-mark-local_lock_t) and 0002 (lockdep-fix-init-map-confusion)
are prerequisites for ntsync_base.patch on lockdep.c. They were commented out,
causing hunk #2 of ntsync_base.patch on kernel/locking/lockdep.c to fail.
The sublevel gating (≤208 for android12-5.10, ≤210 for android13-5.10) prevents
them from applying on newer kernels where the lockdep API has already changed.
TheWildJames 1 месяц назад
Родитель
Сommit
83c6219fd0
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      .github/actions/ntsync/action.yml

+ 6 - 6
.github/actions/ntsync/action.yml

@@ -26,13 +26,13 @@ runs:
           rm -f drivers/misc/ntsync.c
         fi
 
-        #if [[ ( ${{ inputs.version }} == "android12-5.10" && "${{ inputs.sublevel }}" -le "208" ) || ( ${{ inputs.version }} = "android13-5.10" && "${{ inputs.sublevel }}" -le "210" ) ]]; then
-        #  patch -p1 -N < ${{ github.action_path }}/patches/0001-lockdep-mark-local_lock_t.patch
-        #fi
+        if [[ ( ${{ inputs.version }} == "android12-5.10" && "${{ inputs.sublevel }}" -le "208" ) || ( ${{ inputs.version }} = "android13-5.10" && "${{ inputs.sublevel }}" -le "210" ) ]]; then
+          patch -p1 -N < ${{ github.action_path }}/patches/0001-lockdep-mark-local_lock_t.patch
+        fi
 
-        #if [[ ( ${{ inputs.version }} == "android12-5.10" && "${{ inputs.sublevel }}" -le "208" ) || ( ${{ inputs.version }} = "android13-5.10" && "${{ inputs.sublevel }}" -le "210" ) ]]; then
-        #  patch -p1 -N < ${{ github.action_path }}/patches/0002-lockdep-fix-init-map-confusion.patch
-        #fi
+        if [[ ( ${{ inputs.version }} == "android12-5.10" && "${{ inputs.sublevel }}" -le "208" ) || ( ${{ inputs.version }} = "android13-5.10" && "${{ inputs.sublevel }}" -le "210" ) ]]; then
+          patch -p1 -N < ${{ github.action_path }}/patches/0002-lockdep-fix-init-map-confusion.patch
+        fi
 
         if [[ ( ${{ inputs.version }} == "android12-5.10" && "${{ inputs.sublevel }}" -le "208" ) || ( ${{ inputs.version }} = "android13-5.10" && "${{ inputs.sublevel }}" -le "210" ) ]]; then
           patch -p1 -N < ${{ github.action_path }}/patches/0003-lockdep-assert-none-held.patch