beenull/linux-surface
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Apply patches via patch tool instead of git

Browse source 
Apply patches via `patch` instead of `git am`. The `patch` tool is more
liberal in accepting patches and allows patches that need relocation of
hunks, whereas git fails in such instances. Using git makes it harder to
maintain these patches accross multiple kernel versions and we would
need to regularly update them.

Commit separately to keep the git source tree clean before building.
This commit is contained in:
Maximilian Luz 2020-06-14 20:43:01 +02:00
parent 960d4e04ba
commit e531cd70d8
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/debian.yml vendored
View file

@ -43,16 +43,22 @@ jobs:
cd linux
# apply surface build patches
# apply surface build/packaging patches
for PATCH in ../*.patch; do
git am ${PATCH}
patch -p1 < ${PATCH}
done
git add .
git commit --allow-empty -m "Apply linux-surface packaging patches"
# apply surface patches
for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
git am ${PATCH}
patch -p1 < ${PATCH}
done
git add .
git commit --allow-empty -m "Apply linux-surface patches"
- name: Configure
run: |
cd pkg/debian/kernel/linux

12
.github/workflows/debian_lts.yml vendored
View file

@ -43,16 +43,22 @@ jobs:
cd linux
# apply surface build patches
# apply surface build/packaging patches
for PATCH in ../*.patch; do
git am ${PATCH}
patch -p1 < ${PATCH}
done
git add .
git commit --allow-empty -m "Apply linux-surface packaging patches"
# apply surface patches
for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
git am ${PATCH}
patch -p1 < ${PATCH}
done
git add .
git commit --allow-empty -m "Apply linux-surface patches"
- name: Configure
run: |
cd pkg/debian/kernel-lts/linux