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 --- kernels/linux-libre-lts-knock/PKGBUILD | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'kernels/linux-libre-lts-knock') diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index 2d72f2169..f85e92604 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -10,9 +10,10 @@ 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%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname +_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} pkgver=${_pkgver//-/.} @@ -138,13 +139,13 @@ _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}}") + provides=( "${_replaces[@]/%/=${_archver}}") conflicts=("${_replaces[@]}") replaces=( "${_replaces[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install - cd "${srcdir}/${_srcname} + cd "${srcdir}/${_srcname}" # get kernel version _kernver="$(make LOCALVERSION= kernelrelease)" @@ -197,16 +198,10 @@ _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}") - # in case of repackaging this is empty - if [ -z "${_kernver}" ]; then - cd "${srcdir}/linux-${_basekernel}" - _kernver="$(make LOCALVERSION= kernelrelease)" - fi - install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" cd "${pkgdir}/usr/lib/modules/${_kernver}" @@ -343,7 +338,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-54-g00ecf