diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-08-14 02:27:44 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-08-14 02:27:44 -0300 |
| commit | 936d56a07c385cfaab208d5a9ec7fd455d0a7cc9 (patch) | |
| tree | baba99981da354e3da8602b8ea64b9e3ef0eb4b3 | |
| parent | 14d1956e0bc3b5d1da3ad5701031efdfde243d62 (diff) | |
| download | abslibre-936d56a07c385cfaab208d5a9ec7fd455d0a7cc9.tar.gz abslibre-936d56a07c385cfaab208d5a9ec7fd455d0a7cc9.tar.bz2 abslibre-936d56a07c385cfaab208d5a9ec7fd455d0a7cc9.zip | |
linux-libre-lts-rt-3.0.40_rt60-1.1: fixing conflicts, provides and replace to aur version on Archlinux
| -rw-r--r-- | kernels/linux-libre-lts-rt/PKGBUILD | 15 | ||||
| -rw-r--r-- | kernels/linux-libre-lts-rt/linux-libre-lts-rt.install | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD index c7d6e75ef..8f47d0168 100644 --- a/kernels/linux-libre-lts-rt/PKGBUILD +++ b/kernels/linux-libre-lts-rt/PKGBUILD @@ -15,7 +15,7 @@ _releasever=40 _rtpatchver=rt60 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -pkgrel=1 +pkgrel=1.1 _lxopkgver=${_basekernel}.39 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -39,6 +39,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-LTS-RT +_aurversionkernelname=-rt-lts # in this case, in the aur version on Archlinux, the kernel name is different than ours md5sums=('5f64180fe7df4e574dac5911b78f5067' '4c42d5680df7921c20dda6f5fa44b275' 'b7e3a739f569ecac90880624ab05ec6c' @@ -167,9 +168,9 @@ _package() { [ "${pkgbase}" = "linux-libre" ] && groups=('base') depends=('coreutils' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') - provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") - conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") - replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") + provides=("kernel26${_aurversionkernelname}=${pkgver}" "linux${_aurversionkernelname}=${pkgver}") + conflicts=("kernel26${_aurversionkernelname}" "kernel26-libre${_kernelname}" "linux${_aurversionkernelname}") + replaces=("kernel26${_aurversionkernelname}" "kernel26-libre${_kernelname}" "linux${_aurversionkernelname}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgbase}.install if [ "$CARCH" = "mips64el" ]; then @@ -244,9 +245,9 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel" - provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}") - conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers") - replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers") + provides=("kernel26${_aurversionkernelname}-headers=${pkgver}" "linux${_aurversionkernelname}-headers=${pkgver}") + conflicts=("kernel26${_aurversionkernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_aurversionkernelname}-headers") + replaces=("kernel26${_aurversionkernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_aurversionkernelname}-headers") KARCH=x86 [ $CARCH = "mips64el" ] && KARCH=mips diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install index 83072298b..6dc458bae 100644 --- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install +++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-rt -KERNEL_VERSION=3.0.40-1-rt60-LIBRE-LTS-RT +KERNEL_VERSION=3.0.40-1.1-rt60-LIBRE-LTS-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' |