pkgbuild: fixed patch can't be applied

3 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 01217cf85298..cf2b09911f70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -39,7 +39,7 @@ pkgbase = linux-beikeyun-p1
 	md5sums = a9527f30abbbde5c126e93e2bf57b034
 	md5sums = 966cbe04ab5848bf6972411166adfee4
 	md5sums = 7a18066683f3351b2bbd2653db783f80
-	md5sums = da2e45cbcd710b7df01bf83f87fedcb7
+	md5sums = 26fc18028c3120660d85f100e6bf1df8
 	md5sums = 66e0ae63183426b28c0ec0c7e10b5e16
 	md5sums = ce6c81ad1ad1f8b333fd6077d47abdaf
 	md5sums = 3dc88030a8f2f5a5f97266d99b149f77
diff --git a/PKGBUILD b/PKGBUILD
index a9bdc9c5a923..8f562f3b72d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -46,7 +46,7 @@ md5sums=('a082ef5748b813abca0649dab8be5f52'
          'a9527f30abbbde5c126e93e2bf57b034'
          '966cbe04ab5848bf6972411166adfee4'
          '7a18066683f3351b2bbd2653db783f80'
-         'da2e45cbcd710b7df01bf83f87fedcb7'
+         '26fc18028c3120660d85f100e6bf1df8'
          '66e0ae63183426b28c0ec0c7e10b5e16'
          'ce6c81ad1ad1f8b333fd6077d47abdaf'
          '3dc88030a8f2f5a5f97266d99b149f77'
@@ -56,7 +56,8 @@ prepare() {
   cd ${_srcname}
 
   # add upstream patch
-  git apply --whitespace=nowarn ../patch-${pkgver}
+  [[ ${pkgver##*.} != 0 ]] && \
+  patch -p1 < "../patch-${pkgver}"
 
   # dts for Beikeyun P1
   target_dts="rk3328-beikeyun-p1.dts"
@@ -97,7 +98,7 @@ build() {
   # ... or manually edit .config
 
   # Copy back our configuration (use with new kernel version)
-  #cp ./.config ../${pkgbase}.config
+  cp ./.config ../${pkgbase}.config
 
   ####################
   # stop here
diff --git a/config b/config
index b709313f2445..6ada7751f8ad 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.14.0-1 Kernel Configuration
+# Linux/arm64 5.14.2-1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y