From 980300e78b7e71bc0f8163611c34ad1657bde98c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 24 Aug 2014 22:37:34 -0300 Subject: linux-libre kernels: fix provides, replaces and conflicts, keeps it more generic --- kernels/linux-libre-lts-knock/PKGBUILD | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'kernels/linux-libre-lts-knock/PKGBUILD') diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index 497090999..7b2a1440d 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -12,7 +12,9 @@ _pkgbasever=3.10-gnu _pkgver=3.10.53-gnu _knockpatchver=3.10 -_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%-*} @@ -50,7 +52,9 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '') _kernelname=${pkgbase#linux-libre} -_replaces=("${_replaces[@]/\%/${_kernelname}}") +_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") +_replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}") +_replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}") case "$CARCH" in i686|x86_64) KARCH=x86;; @@ -139,9 +143,9 @@ _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[@]/%/=${_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 @@ -198,9 +202,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}" @@ -338,9 +342,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}" -- cgit v1.2.3-54-g00ecf