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 --- libre/linux-libre-grsec/PKGBUILD | 26 +++++++++++++++----------- libre/linux-libre-lts/PKGBUILD | 28 +++++++++++++++------------- libre/linux-libre/PKGBUILD | 30 ++++++++++++++++-------------- libre/lirc-parabola/PKGBUILD | 2 +- 4 files changed, 47 insertions(+), 39 deletions(-) (limited to 'libre') 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}" diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 59b18129f..2bdf25bbe 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -11,8 +11,9 @@ pkgbase=linux-libre-lts # Build kernel with -lts localname _pkgbasever=3.14-gnu _pkgver=3.14.17-gnu -_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname -_replacesalx=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname +_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname +_replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname +_replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} @@ -54,8 +55,9 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '3baf1279805edd561e80877a1baf32d98fe07220dc6e7cb4ced73ab531947bc4') _kernelname=${pkgbase#linux-libre} -_replaces=("${_replaces[@]/\%/${_kernelname}}") -_replacesalx=("${_replacesalx/\%/${_kernelname}}") +_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") +_replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}") +_replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}") case "$CARCH" in i686|x86_64) KARCH=x86;; @@ -132,9 +134,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}}" "${_replacesalx}") - conflicts=("${_replaces[@]}" "${_replacesalx}") - replaces=( "${_replaces[@]}" "${_replacesalx}") + provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -191,9 +193,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}" @@ -310,9 +312,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}" diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 1a15995e6..d8dea06c9 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -11,13 +11,14 @@ pkgbase=linux-libre # Build stock "" kernel _pkgbasever=3.16-gnu _pkgver=3.16.1-gnu -_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname -_replacesalx=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname +_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname +_replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname +_replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1.1 +pkgrel=1.2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -48,8 +49,9 @@ sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218' 'fc78b69f6c0709f5170bfd609e8dc6c96291ea920ddbd4b5166448477b1f6619') _kernelname=${pkgbase#linux-libre} -_replaces=("${_replaces[@]/\%/${_kernelname}}") -_replacesalx=("${_replacesalx/\%/${_kernelname}}") +_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") +_replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}") +_replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}") case "$CARCH" in i686|x86_64) KARCH=x86;; @@ -118,9 +120,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}}" "${_replacesalx}") - conflicts=("${_replaces[@]}" "${_replacesalx}") - replaces=( "${_replaces[@]}" "${_replacesalx}") + provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -177,9 +179,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}" @@ -296,9 +298,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}" diff --git a/libre/lirc-parabola/PKGBUILD b/libre/lirc-parabola/PKGBUILD index 044393d2c..156e48fb3 100644 --- a/libre/lirc-parabola/PKGBUILD +++ b/libre/lirc-parabola/PKGBUILD @@ -37,7 +37,7 @@ md5sums=('1f1fac162ed309dd50f307e96a292957' 'febf25c154a7d36f01159e84f26c2d9a') # Package info -pkgrel=3 +pkgrel=3.1 epoch=1 arch=('i686' 'x86_64' 'mips64el') options=('!makeflags' '!strip') -- cgit v1.2.3