summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado2015-09-27 19:33:07 -0300
committerAndré Fabian Silva Delgado2015-09-27 19:33:33 -0300
commitf52498ee7d059c786b33d948cfc24897147c89c0 (patch)
tree8eb49d0bab3637a04919e6bb2320783a48f02eef /PKGBUILD
parent4a0ee5479e864f64e1289df5014eb2370fe84e2c (diff)
downloadaur-f52498ee7d059c786b33d948cfc24897147c89c0.tar.gz
Remove linux{,-headers,-docs} from conflicts
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD6
1 files changed, 3 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index a3edd435ee8..76c788754ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -179,7 +179,7 @@ _package() {
depends=('coreutils' 'linux-libre-firmware' 'kmod')
optdepends=('crda: to set the correct wireless channels of your country')
provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}")
- conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
+ conflicts=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
[ "${CARCH}" = "armv7h" ] && conflicts+=("${_replacesarchkernel}-uimage") && replaces+=("${_replacesarchkernel}-uimage")
if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
@@ -252,7 +252,7 @@ _package() {
_package-headers() {
pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}")
- conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
+ conflicts=("${_replacesoldkernels[@]/%/-headers}")
replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
@@ -380,7 +380,7 @@ _package-headers() {
_package-docs() {
pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}")
- conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
+ conflicts=("${_replacesoldkernels[@]/%/-docs}")
replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
cd "${srcdir}/${_srcname}"