Updated linux-libre-rt

1 files changed, 30 insertions, 39 deletions

diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 258d89b2f..854432587 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -1,8 +1,10 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: David P. <megver83@parabola.nu>
+# Maintainer: Jesús E. <heckyel@parabola.nu>
+# Contributor: André Silva <emulatorman@riseup.net>
+# Contributor: Márcio Silva <coadde@riseup.net>
 # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor: Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Contributor: Michał Masłowski <mtjm@mtjm.eu>
-# Contributor: Márcio Silva <coadde@parabola.nu>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Luke R. <g4jc@openmailbox.org>
 
@@ -10,9 +12,9 @@
 
 pkgbase=linux-libre-rt
 _pkgbasever=4.9-gnu
-_pkgver=4.9.18-gnu
+_pkgver=4.9.30-gnu
 _rtbasever=4.9
-_rtpatchver=rt14
+_rtpatchver=rt20
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -44,28 +46,28 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         # the main kernel config files
         'config.i686' 'config.x86_64' 'config.armv7h'
         # pacman hook for initramfs regeneration
-        '99-linux.hook'
+        '90-linux.hook'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'change-default-console-loglevel.patch'
         '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
-        '0002-fix-Atmel-maXTouch-touchscreen-support.patch'
+        '0002-fix-Atmel-maXTouch-touchscreen-support.patch')
         # armv7h patches
-        "https://repo.parabola.nu/other/rcn-libre-rt/patches/${_pkgver%-*}/rcn-libre-rt-${_pkgver%-*}-${rcnrel}.patch"
-        "https://repo.parabola.nu/other/rcn-libre-rt/patches/${_pkgver%-*}/rcn-libre-rt-${_pkgver%-*}-${rcnrel}.patch.sig"
-        '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
-        '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
-        '0003-SMILE-Plug-device-tree-file.patch'
-        '0004-fix-mvsdio-eMMC-timing.patch'
-        '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
-        '0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch'
-        '0007-set-default-cubietruck-led-triggers.patch'
-        '0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch')
+#        "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
+#        "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
+#        '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
+#        '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
+#        '0003-SMILE-Plug-device-tree-file.patch'
+#        '0004-fix-mvsdio-eMMC-timing.patch'
+#        '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
+#        '0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch'
+#        '0007-set-default-cubietruck-led-triggers.patch'
+#        '0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch')
 sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca49452f9b1cc80b0826c7a4962dbe4937aecb697aa823b2543ba2cabc704816'
             'SKIP'
-            '71835d01abda766281943ed6ad2665c3bbe5932a76cc0366b0ba444ed95cc6334ee10a8ce1ec1caddc4f8b69fe89f28b4c36acb75d8bc48d18de1fef4f44b274'
+            '470461abe876c3cd44fcc5c8f9de1937506140e3e7f813e562bc2914d84c741a7201934061fa67063f27990b9f854b1f672a3ee79f862368b048a853470afd39'
             'SKIP'
-            '50a071aa0b219e1961d8b9caaf44b2c2ba1cc4d89a07df18d3cd9bd1b9d761a555efc1fb016781d8bf95836bb71f087262b0f6658274b19a70f34c6e6fecb405'
+            '65ce6f60c4a55e661a4f613020c7c384ad53407c2cae122de455fc571552eb654b9e1f1d17710f5ccef5a8366811f6051194e0ad4f5a5086fe1a538402aa0d37'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -73,28 +75,17 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            'c98dbe4a52fbb007e61e2b97a543b161df11c08d3d950e3aec5f914e85b7f90f99338ec2c516e9515261dfed2270faa78282ed755f235cc4a50580b5ac34b787'
-            'f3a669e5c680c3b30823ed0fcfd6a4aa7aa9f29343dad49e779ff70e3bb70d01e256601a778a2d3d747a67921b167971d75beb6814449d689bca3905185b6f4d'
-            'f14d2e7fa4e123c6378a5c8dbeb7bcf7ef372fb72fce056e43773933970792113f9647451d757f7d62313c3ec4c724b090b96b51d0b6ea8897b4ced616de62d2'
+            '9fa5903fc5b9cd892925d4789be5ece7529be161b5373b075239bb40583cb4485e635426c59a0cbfabc1d9ddade5824c40901ea2bb905feb27c3d0f7b6d9f0b7'
+            '49c4065e2f9fe191cfe43c6e3ed825c05e2313b6d7e8ba3015b74d0ac4405e32395a25514fa1627849a733db4d3abfec685d20d71390bb0788e9804206292d3c'
+            'a5202f6f467227ad4fe092c62b9289bc637c726cf2bd8c788546393c90416ecf5cd405608771faba1f1437b9f96699abd6a793b958e61ac829b39981ae18f8b6'
             'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
             'd9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
-            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '973f5e1516ea7bbac64f1259dbf20c260123a38bcdda31c8a537c0430c055b237d3401b0f4e546d0f6754240d81365af4ab6b46a4bd38e221a5de6fd6ab617fd'
-            'SKIP'
-            'ccf18eb2c3d33a57871cbadd5ad825d2f2f489e69c54c7293b160abdc3e9e5c6a664ba7926a617d31affcf20b7ecb4e8de54fa78438c574aa1b257f686faade9'
-            '69f13bb2e353727acbe39034978729272511c6578aa2faf8c829e1bb89c22e769262289b76d93254314304ebd7547c45cdc8ba6afc278444a8fd09f71dff9757'
-            '47038a476ff90d7106e1ce2cf5dd3f2c356c75ab8cefc6901f8eddcbf7cd0f23c44f6ce96b2b3d57a6e3f30bdd5192cf3e75759277ab0ac6fbb179423f2431a0'
-            '75513d1d6dfeb6425763dc8fe8d7f607ddd11d2a8397230333a4e556b303ceb7e68bfdb26d0a10f4b557ef13adbf54c3aab00f5b493772a94b5cd87d143663c4'
-            '37df06631772200edc7e5a4450719155156a781e9a475383283627f6f1b8cbe94db6ba2e2fbc59107ea288846b56881b892e9b21d3d899b974fad4226c4def10'
-            '73916b59fd8f269ce2831d9a0710f503b9cd1004d94caf9e061ebff870a115cc8455409040574a609473e48c60b2f0b833c907327dacb085509e615c27dd463f'
-            'eef5d8161edcc9817832de2000ad30320507a1e16fc321fb2b97dd2d159825b8f924cd29e5a4ffa29c339c8727f106730e6b6858c50d8afe7a5000629507badd'
-            'b3aad9fd9292122fd3227f05d54742731bf4d6d57aaac680b34eca19597dfb56a7f54c7ad54f37cfc2ec7f622fbd90abe7f288f11f8eb98278ab07df32cf890a')
+            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
-              'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
-              '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva
+              '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
               '64254695FFF0AA4466CC19E67B96E8162A8CF5D1' # Sebastian Andrzej Siewior
               '5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt
               'E644E2F1D45FA0B2EAA02F33109F098506FF0B14' # Thomas Gleixner
@@ -196,10 +187,10 @@ build() {
 
 _package() {
   pkgdesc="The ${pkgbase^} kernel and modules with realtime preemption"
-  [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc')
-  depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7')
+  [ "${pkgbase}" = "linux" ] && groups=('base')
+  depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}")
+  provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}" "kernel=${_archpkgver}")
   conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -237,8 +228,8 @@ _package() {
   fi
 
   # install pacman hook for initramfs regeneration
-  sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" |
-    install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook"
+  sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/90-linux.hook" |
+    install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook"
 
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}