linux-libre kernels and dependencies: add libre suffix packages on replaces and conflicts, rename $archver to $archpkgver with improvements on the variables

4 files changed, 17 insertions, 17 deletions

diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index f85e92604..89228825f 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -10,12 +10,12 @@
 pkgbase=linux-libre-lts-knock # Build stock -lts-knock kernel
 _pkgbasever=3.10-gnu
 _pkgver=3.10.53-gnu
-_archver=3.10.53
 _knockpatchver=3.10
 
 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
+_archpkgver=${pkgver%-*}
 pkgver=${_pkgver//-/.}
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
@@ -139,7 +139,7 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${_archver}}")
+  provides=( "${_replaces[@]/%/=${_archpkgver}}")
   conflicts=("${_replaces[@]}")
   replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -198,7 +198,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${_archver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -338,7 +338,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${_archver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")
 
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index a984d646c..f73b1afe4 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -10,11 +10,11 @@
 pkgbase=linux-libre-pae     # Build stock -pae kernel
 _pkgbasever=3.16-gnu
 _pkgver=3.16.1-gnu
-_archver=3.16.1
 
 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
+_archpkgver=${pkgver%-*}
 pkgver=${_pkgver//-/.}
 pkgrel=1
 arch=('i686')
@@ -101,7 +101,7 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${_archver}}")
+  provides=( "${_replaces[@]/%/=${_archpkgver}}")
   conflicts=("${_replaces[@]}")
   replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -162,7 +162,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${_archver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -281,7 +281,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${_archver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")
 
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index f7d9dda81..d8f6b4b31 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -13,13 +13,13 @@
 pkgbase=linux-libre-rt      # Build stock -rt kernel
 _pkgbasever=3.14-gnu
 _pkgver=3.14.12-gnu
-_archver=3.14.12
 _rtbasever=3.14
 _rtpatchver=rt9
 
 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
+_archpkgver=${pkgver%-*}_${_rtpatchver}
 pkgver=${_pkgver//-/.}_${_rtpatchver}
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
@@ -29,7 +29,7 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 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/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
-        "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_archver}-${_rtpatchver}.patch.xz"
+        "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_pkgver%-*}-${_rtpatchver}.patch.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64' 'config.mips64el'
         # standard config files for mkinitcpio ramdisk
@@ -145,7 +145,7 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${_archver}.${_rtpatchver}}")
+  provides=( "${_replaces[@]/%/=${_archpkgver}}")
   conflicts=("${_replaces[@]}")
   replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -204,7 +204,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${_archver}.${_rtpatchver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -323,7 +323,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${_archver}.${_rtpatchver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")
 
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 537d51bd5..ac2e18378 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -10,11 +10,11 @@
 pkgbase=linux-libre-xen     # Build stock -xen kernel
 _pkgbasever=3.16-gnu
 _pkgver=3.16.1-gnu
-_archver=3.16.1
 
 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
+_archpkgver=${pkgver%-*}
 pkgver=${_pkgver//-/.}
 pkgrel=1
 arch=('i686')
@@ -101,7 +101,7 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${_archver}}")
+  provides=( "${_replaces[@]/%/=${_archpkgver}}")
   conflicts=("${_replaces[@]}")
   replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -162,7 +162,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${_archver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -281,7 +281,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${_archver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")