diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD index 3d7eda8b8..cab11bf26 100644 --- a/core/linux-armv7/PKGBUILD +++ b/core/linux-armv7/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-3.13 _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform" pkgver=3.13.6 -pkgrel=1 +pkgrel=2 rcnrel=armv7-x11 arch=('armv7h') url="http://www.kernel.org/" @@ -104,7 +104,7 @@ _package() { depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}" 'aufs_friendly') - conflicts=('linux-omap' 'linux-imx6' 'linux-armada370') + conflicts=('linux-omap' 'linux-imx6' 'linux-armada370' 'linux-wandboard') replaces=('linux-mvebu') install=${pkgname}.install @@ -151,7 +151,7 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for linux kernel - ${_desc}" provides=("linux-headers=${pkgver}") - conflicts=('linux-headers-omap' 'linux-headers-imx6') + conflicts=('linux-headers-omap' 'linux-headers-imx6' 'linux-wandboard-headers') replaces=('linux-mvebu-headers') install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"