summaryrefslogtreecommitdiff
path: root/libre/linux-libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-23 15:11:46 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-23 15:16:01 -0300
commitbf390cc7202b4b3e2b9ad455850ccb4df993bfca (patch)
tree18513657af19728da77703b3a522bc6b01ac6b2c /libre/linux-libre
parent32b9920c6aac8c41a3deaf0a714b06cb278a0a44 (diff)
linux-libre-4.1.6_gnu-1.1: fix conflicts between armv7h kernels
Diffstat (limited to 'libre/linux-libre')
-rw-r--r--libre/linux-libre/PKGBUILD24
1 files changed, 23 insertions, 1 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 27d39d582..2191cdcb9 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -20,7 +20,7 @@ _replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelna
_srcname=linux-${_pkgbasever%-*}
_archpkgver=${_pkgver%-*}
pkgver=${_pkgver//-/_}
-pkgrel=1
+pkgrel=1.1
rcnrel=armv7-x2
arch=('i686' 'x86_64' 'armv7h')
url="http://linux-libre.fsfla.org/"
@@ -185,6 +185,10 @@ _package() {
provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}")
conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
+ if [ "$CARCH" = "armv7h" && "${pkgbase}" != "linux-libre"]; then
+ provides+=("${_replacesarchkernel%${_kernelname}}")
+ conflicts+=("${_replacesarchkernel%${_kernelname}}")
+ fi
if [ "$CARCH" != "armv7h" ]; then
backup=("etc/mkinitcpio.d/${pkgbase}.preset")
fi
@@ -260,6 +264,10 @@ _package-headers() {
provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}")
conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
+ if [ "$CARCH" = "armv7h" && "${pkgbase}" != "linux-libre"]; then
+ provides+=("${_replacesarchkernel%${_kernelname}}-headers")
+ conflicts+=("${_replacesarchkernel%${_kernelname}}-headers")
+ fi
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
@@ -388,6 +396,10 @@ _package-docs() {
provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}")
conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
+ if [ "$CARCH" = "armv7h" && "${pkgbase}" != "linux-libre"]; then
+ provides+=("${_replacesarchkernel%${_kernelname}}-docs")
+ conflicts+=("${_replacesarchkernel%${_kernelname}}-docs")
+ fi
cd "${srcdir}/${_srcname}"
@@ -404,6 +416,8 @@ _package-smileplug() {
pkgdesc="The ${pkgbase^} kernel - Marvell SMILE Plug"
arch=('armv7h')
depends=("${pkgbase}")
+ provides=("${_replacesarchkernel%${_kernelname}}-uimage")
+ conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -416,6 +430,8 @@ _package-mirabox() {
pkgdesc="The ${pkgbase^} kernel - Globalscale Mirabox"
arch=('armv7h')
depends=("${pkgbase}")
+ provides=("${_replacesarchkernel%${_kernelname}}-uimage")
+ conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -428,6 +444,8 @@ _package-ax3() {
pkgdesc="The ${pkgbase^} kernel - OpenBlocks AX3-4"
arch=('armv7h')
depends=("${pkgbase}")
+ provides=("${_replacesarchkernel%${_kernelname}}-uimage")
+ conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -440,6 +458,8 @@ _package-d3plug() {
pkgdesc="The ${pkgbase^} kernel - Globalscale D3Plug"
arch=('armv7h')
depends=("${pkgbase}")
+ provides=("${_replacesarchkernel%${_kernelname}}-uimage")
+ conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -452,6 +472,8 @@ _package-cubox() {
pkgdesc="The ${pkgbase^} kernel - SolidRun Cubox (Marvell)"
arch=('armv7h')
depends=("${pkgbase}")
+ provides=("${_replacesarchkernel%${_kernelname}}-uimage")
+ conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"