1 files changed, 18 insertions, 21 deletions
diff --git a/libre-testing/linux-libre-cros/PKGBUILD b/libre-testing/linux-libre-cros/PKGBUILD
index c4391af24..b2675b305 100644
--- a/libre-testing/linux-libre-cros/PKGBUILD
+++ b/libre-testing/linux-libre-cros/PKGBUILD
@@ -5,23 +5,24 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix
 _replacesoldmodules=() # '%' gets replaced with kernel suffix
 
 pkgbase=linux-libre-cros
-pkgver=5.4.2
+pkgver=5.4.6
 pkgrel=1
-pkgdesc='Linux-libre'
-rcnver=5.4.1
-rcnrel=armv7-x9
-url='https://gitlab.com/libreforks/linux-libre-cros'
+pkgdesc='Linux-libre (Veyron Chromebooks)'
+rcnver=5.4.5
+rcnrel=armv7-x13
+url='https://git.parabola.nu/~megver83/cros-kernel.git'
 arch=(armv7h)
 license=(GPL2)
 makedepends=(
   bc kmod libelf
   xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick
+  git
   uboot-tools vboot-utils dtc
 )
 options=('!strip')
-_srcname=$pkgbase-chromeos-libre-v$pkgver
+_srcname=cros-kernel
 source=(
-  "$pkgbase-$pkgver.tar.gz::https://gitlab.com/libreforks/$pkgbase/-/archive/chromeos-libre-v$pkgver/$_srcname.tar.gz"
+  "git+$url?signed#tag=v$pkgver-gnu"
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}
   config                                     # the main kernel config files
   linux.preset                               # preset file for mkinitcpio ramdisk
@@ -40,6 +41,8 @@ source=(
   0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
   0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
   0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+  0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+
   # RCN patch (CM3 firmware deblobbed and bloatware removed)
   "https://repo.parabola.nu/other/rcn-libre/patches/$rcnver/rcn-libre-$rcnver-$rcnrel.patch"{,.sig}
   # Arch Linux ARM patches
@@ -54,10 +57,9 @@ source=(
   0009-USB-Armory-MkII-support.patch
 )
 validpgpkeys=(
-  '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
   '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
 )
-sha512sums=('4084fd2fbb4d40212180bfe998aaa7b11e612801849750e53e14c9ef3fafd1fb59105206cbfc62d555d735407810b1a66f7dffd382ffac188a10cf9b682d5d2f'
+sha512sums=('SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
@@ -71,12 +73,13 @@ sha512sums=('4084fd2fbb4d40212180bfe998aaa7b11e612801849750e53e14c9ef3fafd1fb591
             '143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '5bb7fa615301014045383b5421901892565ba7f7fd67da93e34a2b032d3721f6f3e677f8fc87072a33d0d79089541e37b5a34a14bfab2a71b587e3abe3e9743f'
-            '3ff6fc2cdf541b73e53b22213dd1b218544b15f363d6ce15f42a6ac2deb928dd8f536962a8162a648751cadde827d25427105d0bac4e596288ef839943b71f3a'
-            'cfa690ea2e500b4a9670cfff96c9ffc675ffd34799b6ee41a7e173fb71d4fb915a8ff8b50f8802bbc59d1e9fe1ac458bdbdd3f0af249fbc44d3cc80b09a9da75'
-            'd71a80d180f4f0a5491fc87dcda6237e53cb309d21d497a76a4f914ce376b53885cd767db2603e6a7ee5b0e6c1f926ac85865614f0997122a73e1e8d1c127749'
-            '56e94bb21c2f233c61f91336b08263bfc28a755e65cd8ddad89186e8f157417f51925927182bca106f03ddae6a5139e78647c48b6961b669444c4337c7b64731'
-            'f0fcf0697f4ea10df04418b4fab6f5a34d7a1c183bd1d72eae18a1103ae0eb3b0da68f35c6cb60e78aae692afe3c11bc1bbb0d232e8e015b4d4bc96451e0c9e3'
+            'c8b2258f0b4206a8a0a2c6b6e9a9877b4c914b401842c7f00d1ddde78bd6734a6cde32db56e3d4e99caa45ae0da0c02593828cadeb1ca813f19d23f6d08be4d2'
+            '3893afefd914017a2932159233fdaffc722a3278755b5a5c6617dd9dd66c2d0d26103e04148709ab7a7e4b74f5efbdba7949c093046592f8d872de864404437f'
+            '6acb44d5da656c154a024ecaa6e071b76bbc1c44cee7fdf317a8b908b71d9d2e9796130abc4b547609cbf898c4a763ba9676963d37eb81d94c44d4695962d02a'
+            '4e2996b2a377324314447e56b7dfd2ac0c4796387f125f6141baa23c0fe331f6225aacce6e32a6ea9b04ae6f70371a0f71ce8b1b7a3cb47c1147d51b0d05054f'
+            'ccee6c7997bf6c9885ea0d2996df9d86c7cfec98748b3947ecd98060fa6bb5a8fed9261586b73d2901718ee1e1e9b8955631f5669ff04e5ef86e82ecce213515'
+            '126d979a1ee72a74259f2afce0947a741a37b23d2c012422e94a498b5afc29361396d8ee8ab96f7c91b6e399f8a3ef3839270e0871bc144eeb26b91609096964'
+            'bc449032f904b5ef5c4506124871230587dd72849f7fed1d7e9f6ab6f530c24415dfa0f29b27fa98191a671c9646b6066fbf163b5533774307dc68f610e3958f'
             'SKIP'
             'b576a9c40ba59485c350f71b9234d9e71f245e25b26382bd2f67019f3309c3b5705a6020eae0a9dfccacc763fb2056a5937c0a8ff4e64f99ba1d60f0b2acb03f'
             '85a13a274d4cbaca3ddbe8eaf883f1a1184765f8d09d6d40bb32defbe0876cb0153513e8db8671d7fc053e383ced793b74245ff29364a760e1a52bb36ebc8e85'
@@ -99,11 +102,6 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
 prepare() {
   cd $_srcname
 
-#   if [ "${_srcname##*-}" != "$pkgver" ]; then
-#     msg2 "Applying upstream patch..."
-#     patch -Np1 -i ../patch-${_srcname##*-}-gnu-$pkgver-gnu
-#   fi
-
   msg2 "Adding freedo as boot logo..."
   install -m644 -t drivers/video/logo \
     ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
@@ -188,7 +186,6 @@ _package() {
     --bootloader bootloader.bin
 
   msg2 "Installing kernel sign..."
-  mkdir -p "$pkgdir/boot"
   cp vmlinux.kpart "$pkgdir/boot"
 
   msg2 "Fixing permissions..."