[pkg-upd] 2022.07rc6-1

PKGBUILD

@@ -5,10 +5,10 @@
 # Contributor: Dragan Simic <dsimic@buserror.io>
 
 pkgname=uboot-pinephonepro
-pkgver=2022.04rc4
-pkgrel=2
+pkgver=2022.07rc6
+pkgrel=1
 epoch=4
-_tfaver=2.6
+_tfaver=2.7.0
 pkgdesc="U-Boot for Pine64 PinePhone Pro"
 arch=('aarch64')
 url='https://source.denx.de/u-boot/u-boot'
@@ -33,8 +33,8 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}.tar.bz2"
         "2001-mmc-sdhci-allow-disabling-sdma-in-spl.patch"
         "3001-pinephone-pro-Remove-cargo-culted-iodomain-config.patch"
         "3002-pine64-pinephonePro-SPI-support.patch")
-sha256sums=('d1f309dae0ab589e26e05850030d4e4f5107c600df84d44f7e88a563a2068ea6'
-            '4e59f02ccb042d5d18c89c849701b96e6cf4b788709564405354b5d313d173f7'
+sha256sums=('fdad16d681e9ac0803f7bb56fd8965d0835eb8fed11159288854a619aad9c010'
+            '553eeca87d4296cdf37361079d1a6446d4b36da16bc25feadd7e465537e7bd4d'
             '12311da7e1a8d7bf19ddf78568e58da0888b0ca89e937aecccae4d896d20b7e2'
             'de7e36cdc7ed2fb5abb9155c97f87926361aa5be87d794c9016776160f3430ec'
             'e55fb02dfb6213eabbb899b468dc5f68d36a11c05feda4c14e80282415222fea'
@@ -56,11 +56,14 @@ prepare() {
           PATCH="${PATCH##*/}"
           [[ ${PATCH} = $1*.patch ]] || continue
           msg2 "Applying patch: ${PATCH}..."
-          patch -N -p1 < "../${PATCH}"
+          patch -N -p1 < "../${PATCH}" || true
       done
   }
 
   cd u-boot-${pkgver/rc/-rc}
+  
+  # Master branch patches
+  apply_patches 0
 
   # Patches specific to the PinePhone Pro
   # NOTE: Patch "1003-Configure-USB-power-settings-for-PinePhone-Pro.patch"