Explorar o código

pkg: debian: Sort patches before applying them

Dorian Stoll hai 1 ano
pai
achega
b9155febc2
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      .github/scripts/package/debian.sh

+ 3 - 2
.github/scripts/package/debian.sh

@@ -76,16 +76,17 @@ build-packages)
     pushd linux || exit 1
 
     # apply surface build/packaging patches
-    find .. -name '*.patch' -type f -print0 | xargs -0 -I '{}' \
+    find .. -name '*.patch' -type f -print0 | sort -z | xargs -0 -I '{}' \
         git apply --index --reject {}
 
     git add .
     git commit --allow-empty -m "Apply linux-surface packaging patches"
 
     KERNEL_MAJORVER="${KERNEL_VERSION%.*}"
+    PATCHES="../../../../patches/${KERNEL_MAJORVER}"
 
     # apply surface patches
-    find "../../../../patches/${KERNEL_MAJORVER}" -name '*.patch' -type f -print0 | xargs -0 -I '{}' \
+    find "${PATCHES}" -name '*.patch' -type f -print0 | sort -z | xargs -0 -I '{}' \
         git apply --index --reject {}
 
     git add .