diff options
22 files changed, 82 insertions, 76 deletions
diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index f85e92604..89228825f 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -10,12 +10,12 @@ 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%' 'linux%') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} +_archpkgver=${pkgver%-*} pkgver=${_pkgver//-/.} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') @@ -139,7 +139,7 @@ _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[@]/%/=${_archver}}") + provides=( "${_replaces[@]/%/=${_archpkgver}}") conflicts=("${_replaces[@]}") replaces=( "${_replaces[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") @@ -198,7 +198,7 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${_archver}}") + provides=( "${_replaces[@]/%/-headers=${_archpkgver}}") conflicts=("${_replaces[@]/%/-headers}") replaces=( "${_replaces[@]/%/-headers}") @@ -338,7 +338,7 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${_archver}}") + provides=( "${_replaces[@]/%/-docs=${_archpkgver}}") conflicts=("${_replaces[@]/%/-docs}") replaces=( "${_replaces[@]/%/-docs}") diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index a984d646c..f73b1afe4 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -10,11 +10,11 @@ pkgbase=linux-libre-pae # Build stock -pae kernel _pkgbasever=3.16-gnu _pkgver=3.16.1-gnu -_archver=3.16.1 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} +_archpkgver=${pkgver%-*} pkgver=${_pkgver//-/.} pkgrel=1 arch=('i686') @@ -101,7 +101,7 @@ _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[@]/%/=${_archver}}") + provides=( "${_replaces[@]/%/=${_archpkgver}}") conflicts=("${_replaces[@]}") replaces=( "${_replaces[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") @@ -162,7 +162,7 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${_archver}}") + provides=( "${_replaces[@]/%/-headers=${_archpkgver}}") conflicts=("${_replaces[@]/%/-headers}") replaces=( "${_replaces[@]/%/-headers}") @@ -281,7 +281,7 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${_archver}}") + provides=( "${_replaces[@]/%/-docs=${_archpkgver}}") conflicts=("${_replaces[@]/%/-docs}") replaces=( "${_replaces[@]/%/-docs}") diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index f7d9dda81..d8f6b4b31 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -13,13 +13,13 @@ pkgbase=linux-libre-rt # Build stock -rt kernel _pkgbasever=3.14-gnu _pkgver=3.14.12-gnu -_archver=3.14.12 _rtbasever=3.14 _rtpatchver=rt9 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} +_archpkgver=${pkgver%-*}_${_rtpatchver} pkgver=${_pkgver//-/.}_${_rtpatchver} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') @@ -29,7 +29,7 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" - "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_archver}-${_rtpatchver}.patch.xz" + "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_pkgver%-*}-${_rtpatchver}.patch.xz" # the main kernel config files 'config.i686' 'config.x86_64' 'config.mips64el' # standard config files for mkinitcpio ramdisk @@ -145,7 +145,7 @@ _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[@]/%/=${_archver}.${_rtpatchver}}") + provides=( "${_replaces[@]/%/=${_archpkgver}}") conflicts=("${_replaces[@]}") replaces=( "${_replaces[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") @@ -204,7 +204,7 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${_archver}.${_rtpatchver}}") + provides=( "${_replaces[@]/%/-headers=${_archpkgver}}") conflicts=("${_replaces[@]/%/-headers}") replaces=( "${_replaces[@]/%/-headers}") @@ -323,7 +323,7 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${_archver}.${_rtpatchver}}") + provides=( "${_replaces[@]/%/-docs=${_archpkgver}}") conflicts=("${_replaces[@]/%/-docs}") replaces=( "${_replaces[@]/%/-docs}") diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 537d51bd5..ac2e18378 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -10,11 +10,11 @@ pkgbase=linux-libre-xen # Build stock -xen kernel _pkgbasever=3.16-gnu _pkgver=3.16.1-gnu -_archver=3.16.1 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} +_archpkgver=${pkgver%-*} pkgver=${_pkgver//-/.} pkgrel=1 arch=('i686') @@ -101,7 +101,7 @@ _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[@]/%/=${_archver}}") + provides=( "${_replaces[@]/%/=${_archpkgver}}") conflicts=("${_replaces[@]}") replaces=( "${_replaces[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") @@ -162,7 +162,7 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${_archver}}") + provides=( "${_replaces[@]/%/-headers=${_archpkgver}}") conflicts=("${_replaces[@]/%/-headers}") replaces=( "${_replaces[@]/%/-headers}") @@ -281,7 +281,7 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${_archver}}") + provides=( "${_replaces[@]/%/-docs=${_archpkgver}}") conflicts=("${_replaces[@]/%/-docs}") replaces=( "${_replaces[@]/%/-docs}") diff --git a/libre/acpi_call-parabola-grsec/PKGBUILD b/libre/acpi_call-parabola-grsec/PKGBUILD index a0a96adf2..05bf0c697 100644 --- a/libre/acpi_call-parabola-grsec/PKGBUILD +++ b/libre/acpi_call-parabola-grsec/PKGBUILD @@ -23,7 +23,8 @@ sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') pkgrel=1 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' -_replaces=("${_pkgname}") +_replaces=("${_pkgname}" "${_pkgname}-libre") +_provides=("${_pkgname}") # Generic (you shouldn't have to modify any of these variables) pkgname=${_pkgname}-parabola${_kernelname} @@ -33,7 +34,7 @@ depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}< makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") replaces=( "${_replaces[@]/%/${_kernelname}}") conflicts=("${_replaces[@]/%/${_kernelname}}") -provides=( "${_replaces[@]/%/${_kernelname}=${pkgver}}") +provides=( "${_provides[@]/%/${_kernelname}=${pkgver}}") if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/acpi_call-parabola-lts/PKGBUILD b/libre/acpi_call-parabola-lts/PKGBUILD index 107dcbaca..681c3399e 100644 --- a/libre/acpi_call-parabola-lts/PKGBUILD +++ b/libre/acpi_call-parabola-lts/PKGBUILD @@ -23,7 +23,8 @@ sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') pkgrel=7 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' -_replaces=("${_pkgname}") +_replaces=("${_pkgname}" "${_pkgname}-libre") +_provides=("${_pkgname}") # Generic (you shouldn't have to modify any of these variables) pkgname=${_pkgname}-parabola${_kernelname} @@ -33,7 +34,7 @@ depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}< makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") replaces=( "${_replaces[@]/%/${_kernelname}}") conflicts=("${_replaces[@]/%/${_kernelname}}") -provides=( "${_replaces[@]/%/${_kernelname}=${pkgver}}") +provides=( "${_provides[@]/%/${_kernelname}=${pkgver}}") if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/acpi_call-parabola/PKGBUILD b/libre/acpi_call-parabola/PKGBUILD index bb1c7ed9b..bf80b98da 100644 --- a/libre/acpi_call-parabola/PKGBUILD +++ b/libre/acpi_call-parabola/PKGBUILD @@ -20,10 +20,11 @@ source=("${url}/archive/v${pkgver}.tar.gz") sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') # Package info -pkgrel=11 +pkgrel=11.1 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' -_replaces=("${_pkgname}") +_replaces=("${_pkgname}" "${_pkgname}-libre") +_provides=("${_pkgname}") # Generic (you shouldn't have to modify any of these variables) pkgname=${_pkgname}-parabola${_kernelname} @@ -33,7 +34,7 @@ depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}< makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") replaces=( "${_replaces[@]/%/${_kernelname}}") conflicts=("${_replaces[@]/%/${_kernelname}}") -provides=( "${_replaces[@]/%/${_kernelname}=${pkgver}}") +provides=( "${_provides[@]/%/${_kernelname}=${pkgver}}") if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/bbswitch-parabola-grsec/PKGBUILD b/libre/bbswitch-parabola-grsec/PKGBUILD index ef50d0b53..393ef3d73 100644 --- a/libre/bbswitch-parabola-grsec/PKGBUILD +++ b/libre/bbswitch-parabola-grsec/PKGBUILD @@ -30,9 +30,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/bbswitch-parabola-lts/PKGBUILD b/libre/bbswitch-parabola-lts/PKGBUILD index fcc404c5d..6182e10c7 100644 --- a/libre/bbswitch-parabola-lts/PKGBUILD +++ b/libre/bbswitch-parabola-lts/PKGBUILD @@ -30,9 +30,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/bbswitch-parabola/PKGBUILD b/libre/bbswitch-parabola/PKGBUILD index 4a3a2f8df..1b0dc8bd6 100644 --- a/libre/bbswitch-parabola/PKGBUILD +++ b/libre/bbswitch-parabola/PKGBUILD @@ -20,7 +20,7 @@ source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807') # Package info -pkgrel=15 +pkgrel=15.1 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' @@ -30,9 +30,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 07a973f1c..1890af721 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -10,13 +10,14 @@ _pkgbasever=3.14-gnu _pkgver=3.14.1-gnu _srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=1.1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL2') -provides=( "linux-api-headers=${pkgver}") +provides=( "linux-api-headers=${_archpkgver}") conflicts=('linux-api-headers') replaces=( 'linux-api-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 7d51ac4f3..d4a97c919 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -19,6 +19,7 @@ _timestamp=201408212335 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*}.${_timestamp} pkgver=${_pkgver//-/.}.${_timestamp} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') @@ -125,7 +126,7 @@ _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[@]/%/=${_archver}.${_timestamp}}") + provides=( "${_replaces[@]/%/=${_archpkgver}}") conflicts=("${_replaces[@]}") replaces=( "${_replaces[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") @@ -193,7 +194,7 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${_archver}.${_timestamp}}") + provides=( "${_replaces[@]/%/-headers=${_archpkgver}}") conflicts=("${_replaces[@]/%/-headers}") replaces=( "${_replaces[@]/%/-headers}") @@ -312,7 +313,7 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${_archver}.${_timestamp}}") + provides=( "${_replaces[@]/%/-docs=${_archpkgver}}") conflicts=("${_replaces[@]/%/-docs}") replaces=( "${_replaces[@]/%/-docs}") diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 925955992..59b18129f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,12 +10,12 @@ pkgbase=linux-libre-lts # Build kernel with -lts localname _pkgbasever=3.14-gnu _pkgver=3.14.17-gnu -_archver=3.14.17 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _replacesalx=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} pkgrel=1.1 arch=('i686' 'x86_64' 'mips64el') @@ -132,7 +132,7 @@ _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[@]/%/=${_archver}}" "${_replacesalx}") + provides=( "${_replaces[@]/%/=${_archpkgver}}" "${_replacesalx}") conflicts=("${_replaces[@]}" "${_replacesalx}") replaces=( "${_replaces[@]}" "${_replacesalx}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") @@ -191,7 +191,7 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${_archver}}") + provides=( "${_replaces[@]/%/-headers=${_archpkgver}}") conflicts=("${_replaces[@]/%/-headers}") replaces=( "${_replaces[@]/%/-headers}") @@ -310,7 +310,7 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${_archver}}") + provides=( "${_replaces[@]/%/-docs=${_archpkgver}}") conflicts=("${_replaces[@]/%/-docs}") replaces=( "${_replaces[@]/%/-docs}") diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index 1a96051e3..3abe280fd 100644 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -8,16 +8,17 @@ pkgname=linux-libre-manpages _pkgver=3.14-gnu _srcname=linux-${_pkgver%-*} +_archpkgver=${pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1 -pkgdesc="Kernel hackers manual - Section 9 manpages that come with the Linux-libre kernel" +pkgrel=1.1 +pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel" arch=('any') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') -provides=('kernel26-manpages' 'linux-manpages') +provides=('kernel26-manpages' "linux-manpages=${_archpkgver}") source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/linux-libre-${_pkgver}.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b') diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 2c62de56a..f390a3d9d 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -18,11 +18,11 @@ pkgname=("${pkgbase}-meta" "${_pkgname[@]}") _pkgbasever=3.16-gnu _pkgver=3.16-gnu -_archver=3.16 _srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1.1 +pkgrel=1.2 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -132,7 +132,7 @@ package_linux-libre-tools-meta() { depends=("${_pkgname[@]}") replaces=(linux-tools-meta) conflicts=(linux-tools-meta) - provides=(linux-tools-meta=$_archver) + provides=(linux-tools-meta=$_archpkgver) } _package_libtraceevent-parabola() { @@ -240,9 +240,9 @@ for _p in "${_pkgname[@]}"; do package_${_p}() { _package_${_p} depends+=(${_depends[${_p%-parabola}]}) - replaces+=(${_p%-parabola}) - conflicts+=(${_p%-parabola}) - provides+=(${_p%-parabola}=${_archver}) + replaces+=("${_p%-parabola}" "${_p/parabola/libre}") + conflicts+=("${_p%-parabola}" "${_p/parabola/libre}") + provides+=(${_p%-parabola}=${_archpkgver}) }" done diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 077fc8cd8..1a15995e6 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,12 +10,12 @@ pkgbase=linux-libre # Build stock "" kernel _pkgbasever=3.16-gnu _pkgver=3.16.1-gnu -_archver=3.16.1 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _replacesalx=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} pkgrel=1.1 arch=('i686' 'x86_64' 'mips64el') @@ -118,7 +118,7 @@ _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[@]/%/=${_archver}}" "${_replacesalx}") + provides=( "${_replaces[@]/%/=${_archpkgver}}" "${_replacesalx}") conflicts=("${_replaces[@]}" "${_replacesalx}") replaces=( "${_replaces[@]}" "${_replacesalx}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") @@ -177,7 +177,7 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${_archver}}") + provides=( "${_replaces[@]/%/-headers=${_archpkgver}}") conflicts=("${_replaces[@]/%/-headers}") replaces=( "${_replaces[@]/%/-headers}") @@ -296,7 +296,7 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${_archver}}") + provides=( "${_replaces[@]/%/-docs=${_archpkgver}}") conflicts=("${_replaces[@]/%/-docs}") replaces=( "${_replaces[@]/%/-docs}") diff --git a/libre/tp_smapi-parabola-grsec/PKGBUILD b/libre/tp_smapi-parabola-grsec/PKGBUILD index 582fb78fa..79dc1f2ea 100644 --- a/libre/tp_smapi-parabola-grsec/PKGBUILD +++ b/libre/tp_smapi-parabola-grsec/PKGBUILD @@ -35,9 +35,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/tp_smapi-parabola-lts/PKGBUILD b/libre/tp_smapi-parabola-lts/PKGBUILD index a070d1fa8..99678a074 100644 --- a/libre/tp_smapi-parabola-lts/PKGBUILD +++ b/libre/tp_smapi-parabola-lts/PKGBUILD @@ -35,9 +35,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/tp_smapi-parabola/PKGBUILD b/libre/tp_smapi-parabola/PKGBUILD index e3fcce1ab..8f73ab13f 100644 --- a/libre/tp_smapi-parabola/PKGBUILD +++ b/libre/tp_smapi-parabola/PKGBUILD @@ -25,7 +25,7 @@ source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.t md5sums=('63c683415c764568f6bf17c7eabe4752') # Package info -pkgrel=52 +pkgrel=52.1 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' @@ -35,9 +35,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/vhba-module-parabola-grsec/PKGBUILD b/libre/vhba-module-parabola-grsec/PKGBUILD index d41a87302..468d7ab0e 100644 --- a/libre/vhba-module-parabola-grsec/PKGBUILD +++ b/libre/vhba-module-parabola-grsec/PKGBUILD @@ -33,9 +33,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/vhba-module-parabola-lts/PKGBUILD b/libre/vhba-module-parabola-lts/PKGBUILD index 2a58763e4..ed17049c8 100644 --- a/libre/vhba-module-parabola-lts/PKGBUILD +++ b/libre/vhba-module-parabola-lts/PKGBUILD @@ -33,9 +33,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/vhba-module-parabola/PKGBUILD b/libre/vhba-module-parabola/PKGBUILD index 43c28cfcf..aa392ecb8 100644 --- a/libre/vhba-module-parabola/PKGBUILD +++ b/libre/vhba-module-parabola/PKGBUILD @@ -22,7 +22,7 @@ md5sums=('6b307a80df9c163768cc7ecb3ccebb71' '4dc37dc348b5a2c83585829bde790dcc') # Package info -pkgrel=6 +pkgrel=6.1 arch=('i686' 'x86_64' 'mips64el') options=(!makeflags) install=$_pkgname.install @@ -33,9 +33,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi |