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-pae/PKGBUILD | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'kernels/linux-libre-pae') diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 4f6344e7e..755571efc 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -11,7 +11,9 @@ pkgbase=linux-libre-pae # Build stock -pae kernel _pkgbasever=3.16-gnu _pkgver=3.16.1-gnu -_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%-*} @@ -42,7 +44,9 @@ sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218' 'f36f61a0a72bcb0a9c04264343503bfbf927c9ea0db819e66734a3933b060588') _kernelname=${pkgbase#linux-libre} -_replaces=("${_replaces[@]/\%/${_kernelname}}") +_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") +_replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}") +_replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}") prepare() { cd "${srcdir}/${_srcname}" @@ -101,9 +105,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 @@ -162,9 +166,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=("${_provides[@]/%/-headers=${_archpkgver}}") + conflicts=("${_provides[@]/%/-headers}" "${_replaces[@]/%/-headers}") + replaces=("${_provides[@]/%/-headers}" "${_replaces[@]/%/-headers}") install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" @@ -281,9 +285,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=("${_provides[@]/%/-docs=${_archpkgver}}") + conflicts=("${_provides[@]/%/-docs}" "${_replaces[@]/%/-docs}") + replaces=("${_provides[@]/%/-docs}" "${_replaces[@]/%/-docs}") cd "${srcdir}/${_srcname}" -- cgit v1.2.3-54-g00ecf