diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-08-23 05:56:12 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-08-23 05:56:12 -0300 |
commit | e015c3d8bae751dc9788da5604cfece47d2c4ce8 (patch) | |
tree | 3d433cb02a2b0393d5a430ddb7468e8f9b90d3e0 /libre | |
parent | 28529fefc594bf968ca30905a5a2d6c9ae1d6f3c (diff) |
fix some issues on the kernels
Diffstat (limited to 'libre')
-rw-r--r-- | libre/linux-libre-grsec/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 15 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 15 |
3 files changed, 22 insertions, 16 deletions
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 2041f3005..7d51ac4f3 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -16,7 +16,7 @@ _pkgver=3.15.10-gnu _grsecver=3.0 _timestamp=201408212335 -_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//-/.}.${_timestamp} @@ -125,7 +125,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[@]/%/=${pkgver}}") + provides=( "${_replaces[@]/%/=${_archver}.${_timestamp}}") conflicts=("${_replaces[@]}") replaces=( "${_replaces[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") @@ -193,7 +193,7 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${pkgver}}") + provides=( "${_replaces[@]/%/-headers=${_archver}.${_timestamp}}") conflicts=("${_replaces[@]/%/-headers}") replaces=( "${_replaces[@]/%/-headers}") @@ -312,7 +312,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}.${_timestamp}}") conflicts=("${_replaces[@]/%/-docs}") replaces=( "${_replaces[@]/%/-docs}") diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index f0f502750..c7af75a14 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,8 +10,10 @@ pkgbase=linux-libre-lts # Build kernel with -lts localname _pkgbasever=3.14-gnu _pkgver=3.14.17-gnu +_archver=3.14.17 -_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//-/.} @@ -53,6 +55,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' _kernelname=${pkgbase#linux-libre} _replaces=("${_replaces[@]/\%/${_kernelname}}") +_replacesalx=("${_replacesalx/\%/${_kernelname}}") case "$CARCH" in i686|x86_64) KARCH=x86;; @@ -129,9 +132,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 @@ -188,7 +191,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}") @@ -307,7 +310,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}") 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}") |