From e015c3d8bae751dc9788da5604cfece47d2c4ce8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 23 Aug 2014 05:56:12 -0300 Subject: fix some issues on the kernels --- libre/linux-libre/PKGBUILD | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'libre/linux-libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index c5a85232e..75e5618e4 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,8 +10,10 @@ pkgbase=linux-libre # Build stock "" kernel _pkgbasever=3.16-gnu _pkgver=3.16.1-gnu +_archver=3.16.1 -_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname +_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname +_replacesalx=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} pkgver=${_pkgver//-/.} @@ -47,6 +49,7 @@ sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218' _kernelname=${pkgbase#linux-libre} _replaces=("${_replaces[@]/\%/${_kernelname}}") +_replacesalx=("${_replacesalx/\%/${_kernelname}}") case "$CARCH" in i686|x86_64) KARCH=x86;; @@ -115,9 +118,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[@]/%/=${pkgver}}") - conflicts=("${_replaces[@]}") - replaces=( "${_replaces[@]}") + provides=( "${_replaces[@]/%/=${_archver}}" "${_replacesalx}") + conflicts=("${_replaces[@]}" "${_replacesalx}") + replaces=( "${_replaces[@]}" "${_replacesalx}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -174,7 +177,7 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${pkgver}}") + provides=( "${_replaces[@]/%/-headers=${_archver}}") conflicts=("${_replaces[@]/%/-headers}") replaces=( "${_replaces[@]/%/-headers}") @@ -293,7 +296,7 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${pkgver}}") + provides=( "${_replaces[@]/%/-docs=${_archver}}") conflicts=("${_replaces[@]/%/-docs}") replaces=( "${_replaces[@]/%/-docs}") -- cgit v1.2.3