diff options
author | Det | 2015-07-17 23:17:16 +0300 |
---|---|---|
committer | Det | 2015-07-17 23:17:16 +0300 |
commit | 67fc124d0184d1d64e16bd6747aa0162eed00bc0 (patch) | |
tree | 54924c34a7691c46f6be9fdb6d2589dbc246f1d8 | |
parent | 53dd6a2b34f87066921cd8c23603118b9d1e1be1 (diff) | |
download | aur-67fc124d0184d1d64e16bd6747aa0162eed00bc0.tar.gz |
Fix patching
-rw-r--r-- | PKGBUILD | 34 |
1 files changed, 15 insertions, 19 deletions
@@ -34,11 +34,10 @@ md5sums_i686=('c91760a04f658845722380f6c7fd4709') md5sums_x86_64=('4eea308a1b04553f720f82fd2fac79d3') [[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('60bcf9f25c0736b17a48bf1e060cb271') -# Auto-detect patches -_patches=($(ls *.patch 2>/dev/null)) -for _patch in ${_patches[@]}; do - source+=("$_patch") - md5sums+=('SKIP') +# Auto-detect patches (e.g. nvidia-linux-4.1.patch) +for _patch in $(ls "$startdir"/*.patch 2>/dev/null); do + source+=("$_patch") + md5sums+=('SKIP') done _create_links() { @@ -72,25 +71,22 @@ prepare() { cp -r kernel kernel-$_kernel # Patch? - if [[ $(ls "$srcdir"/*.patch 2>/dev/null) ]]; then + for _patch in $(ls "$srcdir"/*.patch 2>/dev/null); do + # Patch version + _major_patch=$(echo $_patch | grep -Po "\d+\.\d+") + # Cd in place cd kernel-$_kernel - - # Loop all patches - for _patch in "$srcdir"/*.patch; do - # Patch version - _major_patch=$(echo $_patch | grep -Po "\d+\.\d+") - - # Check version - if (( $(vercmp $_kernel $_major_patch) >= 0 )); then - msg2 "Applying ${_patch##*/} for $_kernel..." - patch -p2 -i "$_patch" - fi - done + + # Check version + if (( $(vercmp $_kernel $_major_patch) >= 0 )); then + msg2 "Applying ${_patch##*/} for $_kernel..." + patch -p2 -i "$_patch" + fi # Return cd .. - fi + done done } |