linux-libre-4.2.1_gnu-1: updating version

1 files changed, 31 insertions, 7 deletions

diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD
index 45289d4c5..6f658f9e3 100644
--- a/libre-testing/linux-libre/PKGBUILD
+++ b/libre-testing/linux-libre/PKGBUILD
@@ -11,16 +11,16 @@
 pkgbase=linux-libre         # Build stock kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _pkgbasever=4.2-gnu
-_pkgver=${_pkgbasever}
+_pkgver=4.2.1-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
-_replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
-_replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
+_replacesoldkernels=() # '%' gets replaced with _kernelname
+_replacesoldmodules=() # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
-pkgrel=4
+pkgrel=1
 rcnrel=armv7-x2
 arch=('i686' 'x86_64' 'armv7h')
 url="http://linux-libre.fsfla.org/"
@@ -32,8 +32,8 @@ fi
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign"
         "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm"
         "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"
@@ -62,6 +62,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0008-USB-armory-support.patch')
 sha256sums=('3a8fc9da5a38f15cc4ed0c5132d05b8245dfc1007c37e7e1994b2486535ecf49'
             'SKIP'
+            '2fb0b42c6cac0bd550ceb71072fef4f7ed72976e64542de8e7ad759a9e195237'
+            'SKIP'
             'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
             'SKIP'
             '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74'
@@ -77,7 +79,7 @@ sha256sums=('3a8fc9da5a38f15cc4ed0c5132d05b8245dfc1007c37e7e1994b2486535ecf49'
             '6ed9e31ae5614c289c4884620e45698e764c03670ebc45bab9319d741238cbd3'
             '0a8fe4434e930d393c7983e335842f6cb77ee263af5592a0ca7e14bae7296183'
             '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
-            'd42780dcc79c1c50c60cb8ebfd68be4f07e11b72bf28265bc6dd898e10a215f4'
+            '1d365219ca72ef7290277a47c45a4f406705f27a9f7c177ac860da0e5b994bdb'
             'SKIP'
             '2654680bc8f677f647bca6e2b367693bf73ffb2edc21e3757a329375355a335d'
             '842e4f483fa36c0e7dbe18ad46d78223008989cce097e5bef1e14450280f5dfe'
@@ -202,6 +204,10 @@ _package() {
   provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}")
   conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
+  if [ "$CARCH" = "armv7h" && "${pkgbase}" != "linux-libre"]; then
+    provides+=("${_replacesarchkernel%${_kernelname}}")
+    conflicts+=("${_replacesarchkernel%${_kernelname}}")
+  fi
   if [ "$CARCH" != "armv7h" ]; then
     backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   fi
@@ -277,6 +283,10 @@ _package-headers() {
   provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}")
   conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
   replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
+  if [ "$CARCH" = "armv7h" && "${pkgbase}" != "linux-libre"]; then
+    provides+=("${_replacesarchkernel%${_kernelname}}-headers")
+    conflicts+=("${_replacesarchkernel%${_kernelname}}-headers")
+  fi
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
@@ -405,6 +415,10 @@ _package-docs() {
   provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}")
   conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
   replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
+  if [ "$CARCH" = "armv7h" && "${pkgbase}" != "linux-libre"]; then
+    provides+=("${_replacesarchkernel%${_kernelname}}-docs")
+    conflicts+=("${_replacesarchkernel%${_kernelname}}-docs")
+  fi
 
   cd "${srcdir}/${_srcname}"
 
@@ -421,6 +435,8 @@ _package-smileplug() {
   pkgdesc="The ${pkgbase^} kernel - Marvell SMILE Plug"
   arch=('armv7h')
   depends=("${pkgbase}")
+  provides=("${_replacesarchkernel%${_kernelname}}-uimage")
+  conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
 
   cd "${srcdir}/${_srcname}"
 
@@ -433,6 +449,8 @@ _package-mirabox() {
   pkgdesc="The ${pkgbase^} kernel - Globalscale Mirabox"
   arch=('armv7h')
   depends=("${pkgbase}")
+  provides=("${_replacesarchkernel%${_kernelname}}-uimage")
+  conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
 
   cd "${srcdir}/${_srcname}"
 
@@ -445,6 +463,8 @@ _package-ax3() {
   pkgdesc="The ${pkgbase^} kernel - OpenBlocks AX3-4"
   arch=('armv7h')
   depends=("${pkgbase}")
+  provides=("${_replacesarchkernel%${_kernelname}}-uimage")
+  conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
 
   cd "${srcdir}/${_srcname}"
 
@@ -457,6 +477,8 @@ _package-d3plug() {
   pkgdesc="The ${pkgbase^} kernel - Globalscale D3Plug"
   arch=('armv7h')
   depends=("${pkgbase}")
+  provides=("${_replacesarchkernel%${_kernelname}}-uimage")
+  conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
 
   cd "${srcdir}/${_srcname}"
 
@@ -469,6 +491,8 @@ _package-cubox() {
   pkgdesc="The ${pkgbase^} kernel - SolidRun Cubox (Marvell)"
   arch=('armv7h')
   depends=("${pkgbase}")
+  provides=("${_replacesarchkernel%${_kernelname}}-uimage")
+  conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
 
   cd "${srcdir}/${_srcname}"