upgpkg: kernels/linux-libre-rt 4.14.63_gnu.rt40-1

Signed-off-by: David P <megver83@parabola.nu>

2 files changed, 28 insertions, 30 deletions

diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 289b90f38..24fc1031a 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -10,30 +10,30 @@
 # Based on linux-rt package
 
 pkgbase=linux-libre-rt
-_pkgbasever=4.14-gnu
-_pkgver=4.14.52-gnu
+_srcbasever=4.14-gnu
+_srcver=4.14.63-gnu
 _rtbasever=4.14
-_rtpatchver=rt34
+_rtpatchver=rt40
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
 _replacesoldmodules=() # '%' gets replaced with _kernelname
 
-_srcname=linux-${_pkgbasever%-*}
-_archpkgver=${_pkgver%-*}_${_rtpatchver}
-pkgver=${_pkgver//-/_}.${_rtpatchver}
+_srcname=linux-${_srcbasever%-*}
+_archpkgver=${_srcver%-*}_${_rtpatchver}
+pkgver=${_srcver//-/_}.${_rtpatchver}
 pkgrel=1
-rcnrel=armv7-x4
+rcnrel=armv7-x6
 arch=('x86_64' 'i686' 'armv7h')
 url="https://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
 options=('!strip')
 source=(
-  "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"{,.sign}
-  "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"{,.sign}
-  "https://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/older/patch-${_pkgver%-*}-${_rtpatchver}.patch.xz"
-  "https://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/older/patch-${_pkgver%-*}-${_rtpatchver}.patch.sign"
+  "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcbasever}/linux-libre-${_srcbasever}.tar.xz"{,.sign}
+  "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcver}/patch-${_srcbasever}-${_srcver}.xz"{,.sign}
+  "https://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/older/patch-${_srcver%-*}-${_rtpatchver}.patch.xz"
+  "https://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/older/patch-${_srcver%-*}-${_rtpatchver}.patch.sign"
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm"{,.sig}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"{,.sig}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig}
@@ -44,7 +44,7 @@ source=(
   # standard config files for mkinitcpio ramdisk
   'linux.preset'
   # armv7h patches
-  "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"{,.sig}
+  "https://repo.parabola.nu/other/rcn-libre/patches/${_srcver%-*}/rcn-libre-${_srcver%-*}-${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'
@@ -73,9 +73,9 @@ validpgpkeys=(
 )
 sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e684147ebed91d1528d2685423dd784c5fca0f3650f874f2b93cfc6b7689b9a87f'
             'SKIP'
-            'd143a0b1fd687f8a240cf480b784d7ae3082c6bb0eefaf00944bcb1598df4dd26dea252082982c0be22cc7e99c8ef968d18d992d3ef5ddd3f906e7465451bf8c'
+            'eb10220130f8cf8e24718db545e45eed2b54930d7dfb44a9ad2a445b1ec5060112f6f962257c16844499790b8cf57bcc19249a57d2e48df122a265cc2b59b4c2'
             'SKIP'
-            '78a85512412c5caf0a4d83b8b6dcb78087635f1c35abbc2675860d67ecebdd31b0d6c986ae61af76c776b66889bf626223e5ff0774ae524df2495ce7cb72ae33'
+            '667f872df8ee8cb86fb923500115c23efce3329ddba38875c13e4a02e793eae7b73215dfa7c8fb9efdca7e3e2fc1843801ead5f6947cea6234be454e4b7ec856'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -83,13 +83,13 @@ sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e6841
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            '7f7aeb552ef1589b790082f85c54b1f959818ceb7404453b672dd29029e42c85a901fbc20a72d0a9d3e7e1f86f145a6dc119e4aa24a8e0aa3a06c019a17452be'
+            '3a3df442e8022c14d7f7bf0b63086d092473224cc9d67a909d740c30ce19bf19cbdbe14a44e41cb72e8f2fc06bc2e0b4853aed1503973de7dc23cdc58cc5c2f3'
             '5ac1ba47061b87aed811f23e1aff8d345695d5ed484f74f0a7d1725b8b1459de532f8148c47555124dcc339de35851908fb47e52494a1cda1a5a95365d032980'
-            'e4c7eed2863ae6350192d36b374aca2c5eab47e0c0ffaf732335f0f94ab09929924902eceaf94a120462d629c640fc52d3802af8af658506e34b901ef7745018'
+            'c24efec65649d9edc08f09bd6644106c810bfce5cfe30f154f7aeb8a5807b00f532d1f54cf67ac72450e9ace353181bcddc2253ea0ee963a9e92b9889c7e05dc'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            '8f5fe2da45ff82207a2348177b7e8280ad3e4950ee3d828b6b0a235b51a0faac54235d18fde83caaef7163d9bc15ec1daf331271d269b31df44e11080a800c67'
+            '9f1c971a28bc4e0d99fb2639412d6e76c237e80a15690ab0ebbcacca3db47b5de1622655bb93d8b391edc52168c636175ca2c314119af4fcb944c47e2aa4ca06'
             'SKIP'
             'ba44aa1252aa1b172e0bc8bbbff864ff60cad6739b2aed2f6a2402848aa65cdb8a8ca6bb9341569b089d60dfd83c3bdd744b5810061ac76b19f0d337afe4cc8d'
             '738bc2874351d9e1b94319e6caf615b49753155c99dc9318a1ce9eced50f87627a7331762951f55e2bea8abdb97b80a617a08f3f0bc735e56ff831a8bbb19816'
@@ -124,13 +124,13 @@ prepare() {
   cd ${_srcname}
 
   # add upstream patch
-  if [ "${_pkgbasever}" != "${_pkgver}" ]; then
-    patch -p1 -i ../patch-${_pkgbasever}-${_pkgver}
+  if [ "${_srcbasever}" != "${_srcver}" ]; then
+    patch -p1 -i ../patch-${_srcbasever}-${_srcver}
   fi
   chmod +x tools/objtool/sync-check.sh  # GNU patch doesn't support git-style file mode
   
   # add realtime patch
-  patch -p1 -i ../patch-${_pkgver%-*}-${_rtpatchver}.patch
+  patch -p1 -i ../patch-${_srcver%-*}-${_rtpatchver}.patch
   rm localversion-rt
   
   if [ "${CARCH}" = "armv7h" ]; then
@@ -138,7 +138,7 @@ prepare() {
     # Note: For stability reasons, AUFS has been removed in the RCN patch.
     # We are supporting AUFS in linux-libre-pck through PCK patch.
     # See https://wiki.parabola.nu/PCK for further details.
-    patch -p1 -i ../rcn-libre-${_pkgver%-*}-${rcnrel}.patch
+    patch -p1 -i ../rcn-libre-${_srcver%-*}-${rcnrel}.patch
 
     # ALARM patches
     patch -p1 -i ../0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -224,7 +224,7 @@ 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')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_pkgver%%-*}")
+  provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_srcver%%-*}")
   conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -271,7 +271,7 @@ pkgdesc="The ${pkgbase^} kernel and modules with realtime preemption"
     s|%KERNVER%|${_kernver}|g
     s|%EXTRAMODULES%|${_extramodules}|g
   "
-  elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
+  else
   local _subst="
     s|%PKGBASE%|${pkgbase}|g
     s|%KERNVER%|${_kernver}|g
@@ -311,11 +311,10 @@ _package-headers() {
   cp -t "${_builddir}" -a include scripts
 
   install -Dt "${_builddir}/arch/${KARCH}" -m644 arch/${KARCH}/Makefile
-  install -Dt "${_builddir}/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s
-  
   if [[ ${CARCH} = i686 ]]; then
     install -t "${_builddir}/arch/${KARCH}" -m644 arch/${KARCH}/Makefile_32.cpu
   fi
+  install -Dt "${_builddir}/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s
 
   cp -t "${_builddir}/arch/${KARCH}" -a arch/${KARCH}/include
 
@@ -354,9 +353,9 @@ _package-headers() {
   # remove files already in linux-docs package
   rm -r "${_builddir}/Documentation"
   
-  # parabola changes
+  # Parabola changes
   # 
-  # since we don't want to diverge too much from arch's pkgbuild, we'll
+  # since we don't want to diverge too much from Arch's PKGBUILD, we'll
   # start marking our changes as such
   if [ "${CARCH}" = "armv7h" ]; then
     for i in dove exynos omap2; do
@@ -368,7 +367,7 @@ _package-headers() {
       cp -a arch/${KARCH}/plat-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-${i}/"
     done
   fi
-  # end of parabola changes
+  # end of Parabola changes
 
   # remove now broken symlinks
   find -L "${_builddir}" -type l -printf 'Removing %P\n' -delete
diff --git a/kernels/linux-libre-rt/config.armv7h b/kernels/linux-libre-rt/config.armv7h
index 7c850ee47..af4a1de01 100644
--- a/kernels/linux-libre-rt/config.armv7h
+++ b/kernels/linux-libre-rt/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.52-gnu-1-rt Kernel Configuration
+# Linux/arm 4.14.63-gnu-1-rt Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -6746,7 +6746,6 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_AUXDISPLAY is not set
-CONFIG_ARM_CHARLCD=y
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV_GENIRQ=m