upgpkg: kernels/linux-libre-lts-xtreme 4.9.124_gnu-1

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

2 files changed, 19 insertions, 21 deletions

diff --git a/kernels/linux-libre-lts-xtreme/PKGBUILD b/kernels/linux-libre-lts-xtreme/PKGBUILD
index 1337f9230..06e83a5c7 100644
--- a/kernels/linux-libre-lts-xtreme/PKGBUILD
+++ b/kernels/linux-libre-lts-xtreme/PKGBUILD
@@ -9,27 +9,27 @@
 # Based on linux-lts package
 
 pkgbase=linux-libre-lts-xtreme
-_pkgbasever=4.9-gnu
-_pkgver=4.9.110-gnu
+_srcbasever=4.9-gnu
+_srcver=4.9.124-gnu
 _knockpatchver=4.9_1
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
 _replacesoldmodules=() # '%' gets replaced with _kernelname
 
-_srcname=linux-${_pkgbasever%-*}
-_archpkgver=${_pkgver%-*}
-pkgver=${_pkgver//-/_}
+_srcname=linux-${_srcbasever%-*}
+_archpkgver=${_srcver%-*}
+pkgver=${_srcver//-/_}
 pkgrel=1
-rcnrel=armv7-x6
+rcnrel=armv7-x8
 arch=('x86_64' 'i686' 'armv7h')
 url="https://wiki.parabola.nu/Xtreme"
 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://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://repo.parabola.nu/other/knock/patches/linux-libre/tcp_stealth_${_knockpatchver}.diff"{,.sig}
   "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}
@@ -41,7 +41,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'
@@ -62,7 +62,7 @@ validpgpkeys=(
 )
 sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca49452f9b1cc80b0826c7a4962dbe4937aecb697aa823b2543ba2cabc704816'
             'SKIP'
-            '14a03a7fca5880af214a5bebb871d77c1b9fe0f77dc9fbb216320bd5daee13834c1b5b49b99a9da279412e670b20276960998cbca72c1d406557aba161f44739'
+            'e44d91d5dbefa90569e48fc9752e56a61c4975e74f0691a8e578ae01cc63522ab9fd6eb8728f617570862f34f5dfa2de129cfb7838be1167e68684855762504d'
             'SKIP'
             'a00e9fc0b930021242b231dfdd15160eaefbfad4aaa0ba0426bb9a25dd14acc1825cbb1bc9c680a6d43baca797591dc219e232862f566457752ff378e03600a3'
             'SKIP'
@@ -74,11 +74,11 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
             'SKIP'
             '8ac7529169f743320c9daace159a50f9bad749168315bec7ada5821fb97b98e30802661c8e2c28aa38a4f9dd7d093fe7eea7ae98fb4f28b0b3395144edba777d'
             '9ca49ece02fe3aa8d105c682bdce5be7cf1642f5414c4d95342ecf317476dd4f96606fbb36fbd876b0f9a7068d4b833bfae78b85a9801ed689a7b236d791e72e'
-            'fafa42c20a95493e08fc95863c42a4d7409537de37fbe321c1087db5b0e49aa02d21c331694158b68f6fd50e4145d19efd134e297cb70bb6369550b07574bc9b'
+            '20c0d7264bbad38fed208dbb7bf65fdf2c032f2d54aaa4e4cebf003f1806ba47fe5fc7718f1695ed1945145a7554e2c8cac1fb8ff5b42093cc9a6cfbc76ecfd1'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            'd607b69dfd0119476afec2a4eb18a0483cbc41e303dca8c1dfa55f449cd874a14f162e234fcb9afa699faed6d97297b474d725bbc24dbad1004e4c3949bc7626'
+            '9f857284e7c90025efbe1c597285fe08bf216dc9acf9615777d9fdb66f3a8bc263a93a4f28a633a7bd809b1b84bd7b249abafd3e854f48e100ce60ced832fa3a'
             'SKIP'
             '3241bf6817dc4702c7ddc912e5c3eed02c278f7d50685e2aa8de452b1a70db9dcf029f430d9c3d6fe8ddbfc76dba4194ec7a060730565ef9416624eac5b3ef86'
             '77191c0a90d27d8eb98dd46945cac09f62f8e483f99f9c863fd6112fbe7fc4ece7121bc9a4130052c5180ce59e465d16300acf1e23a35dcb29a21a14af8321d4'
@@ -107,8 +107,8 @@ 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
 
   # add Knock patch
@@ -119,7 +119,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
@@ -202,7 +202,7 @@ pkgdesc="The ${pkgbase^} kernel and modules - stable longtime supported kernel p
               'apparmor: to configure and enable mandatory access control for programs'
               'openssh-knock: to use SSH with TCP Stealth support'
               'tomoyo-utils: to manage tomoyo userspace tools')
-  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")
@@ -252,7 +252,7 @@ pkgdesc="The ${pkgbase^} kernel and modules - stable longtime supported kernel p
     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
@@ -292,11 +292,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
 
diff --git a/kernels/linux-libre-lts-xtreme/config.armv7h b/kernels/linux-libre-lts-xtreme/config.armv7h
index 47a763ed3..3d0de85af 100644
--- a/kernels/linux-libre-lts-xtreme/config.armv7h
+++ b/kernels/linux-libre-lts-xtreme/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.107-gnu-1-lts-xtreme Kernel Configuration
+# Linux/arm 4.9.124-gnu-1-lts-xtreme Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2138,7 +2138,6 @@ CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_TI_DAC7512=m
-CONFIG_ARM_CHARLCD=y
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y