summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2017-12-11 02:20:36 +0200
committerDet2017-12-11 02:20:36 +0200
commit6d9d3d655dab9c231f95d7adbf7f392c6725ce45 (patch)
treed7858afba7164a93d65134a1d76f69f80b4f0cbe
parenta97db7e04da75273a5d521fa6876dcf7d87bca76 (diff)
downloadaur-6d9d3d655dab9c231f95d7adbf7f392c6725ce45.tar.gz
Patch automatino tweaks
-rw-r--r--PKGBUILD6
1 files changed, 3 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 13784eaed0b0..b939e3dab02d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ md5sums=('a009bbc502c30e4b483d71be9fa51790')
#md5sums+=('cc8941b6898d9daa0fb67371f57a56b6')
# Auto-detect patches (e.g. linux-4.1.patch)
-for _patch in $(find "$startdir" -maxdepth 1 -name '*.patch' -printf "%f\n"); do
+for _patch in $(find -maxdepth 1 -name '*[0-9].[0-9]*.patch' -printf "%f\n"); do
# Don't duplicate those already defined above
if [[ ! ${source[@]} =~ $_patch ]]; then
source+=("$_patch")
@@ -47,7 +47,7 @@ prepare() {
cp -r kernel kernel-$_kernel
# Patch?
- for _patch in $(ls "$srcdir"/*.patch 2>/dev/null); do
+ for _patch in $(printf -- '%s\n' ${source[@]} | grep -e [0-9].[0-9] -e .patch); do
# Patch version
_major_patch=$(echo $_patch | grep -Po "\d+\.\d+")
@@ -57,7 +57,7 @@ prepare() {
# Check version
if (( $(vercmp $_kernel $_major_patch) >= 0 )); then
msg2 "Applying $_patch for $_kernel..."
- patch -p2 -i "$_patch"
+ patch -p2 -i "$srcdir"/"$_patch"
fi
# Return