linux-libre kernels: fix provides, replaces and conflicts, keeps it more generic

1 files changed, 15 insertions, 11 deletions

diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index d4a97c919..4b399ae80 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -16,7 +16,9 @@ _pkgver=3.15.10-gnu
 _grsecver=3.0
 _timestamp=201408212335
 
-_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
+_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
+_replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
+_replacesoldmodules=() # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}.${_timestamp}
@@ -54,7 +56,9 @@ sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688'
             '3854de5c0be17555dc0c5b4ec4e831225eaacf413395d74568a06abcddf3a242')
 
 _kernelname=${pkgbase#linux-libre}
-_replaces=("${_replaces[@]/\%/${_kernelname}}")
+_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
+_replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}")
+_replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}")
 
 case "$CARCH" in
   i686|x86_64) KARCH=x86;;
@@ -126,9 +130,9 @@ _package() {
   optdepends=('crda: to set the correct wireless channels of your country'
               'gradm: to configure and enable Role Based Access Control (RBAC)'
               'paxd: to enable PaX exploit mitigations and apply exceptions automatically')
-  provides=( "${_replaces[@]/%/=${_archpkgver}}")
-  conflicts=("${_replaces[@]}")
-  replaces=( "${_replaces[@]}")
+  provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}")
+  conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
+  replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=linux.install
 
@@ -194,9 +198,9 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${_archpkgver}}")
-  conflicts=("${_replaces[@]/%/-headers}")
-  replaces=( "${_replaces[@]/%/-headers}")
+  provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}")
+  conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
+  replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
@@ -313,9 +317,9 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${_archpkgver}}")
-  conflicts=("${_replaces[@]/%/-docs}")
-  replaces=( "${_replaces[@]/%/-docs}")
+  provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}")
+  conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
+  replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
 
   cd "${srcdir}/${_srcname}"