summaryrefslogtreecommitdiff
path: root/libre-testing
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-26 07:44:54 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-26 07:44:54 -0300
commit696e3f83a0153fed08934e1b83f3489c00355440 (patch)
treeea7c62d8b9e5c46112069a02f46c33e9a24d9921 /libre-testing
parentb1e4c27b0babd309c2024626a53faac832c81e02 (diff)
fix conflicts between armv7h kernels
Diffstat (limited to 'libre-testing')
-rw-r--r--libre-testing/linux-libre-pck/PKGBUILD51
-rw-r--r--libre-testing/linux-libre/PKGBUILD51
2 files changed, 64 insertions, 38 deletions
diff --git a/libre-testing/linux-libre-pck/PKGBUILD b/libre-testing/linux-libre-pck/PKGBUILD
index ad5784108..214f04f2f 100644
--- a/libre-testing/linux-libre-pck/PKGBUILD
+++ b/libre-testing/linux-libre-pck/PKGBUILD
@@ -178,9 +178,10 @@ _package() {
'systemd-knock: to use system and service manager with TCP Stealth support'
'openssh-knock: to use SSH with TCP Stealth support')
if [ "${CARCH}" = "armv7h" ]; then
- provides=("${_replacesarchkernel%${_kernelname}}")
- conflicts=("${_replacesarchkernel%${_kernelname}}")
- replaces=("${_replacesarchkernel%${_kernelname}}")
+ provides=("${_replacesarchkernel}")
+ conflicts=("${_replacesarchkernel}")
+ replaces=("${_replacesarchkernel}")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}")
elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
depends+=('mkinitcpio>=0.7')
provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}")
@@ -258,9 +259,10 @@ _package() {
_package-headers() {
pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
if [ "${CARCH}" = "armv7h" ]; then
- provides=("${_replacesarchkernel%${_kernelname}}-headers")
- conflicts=("${_replacesarchkernel%${_kernelname}}-headers")
- replaces=("${_replacesarchkernel%${_kernelname}}-headers")
+ provides=("${_replacesarchkernel}-headers")
+ conflicts=("${_replacesarchkernel}-headers")
+ replaces=("${_replacesarchkernel}-headers")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-headers")
elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}")
conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
@@ -392,9 +394,10 @@ _package-headers() {
_package-docs() {
pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
if [ "${CARCH}" = "armv7h" ]; then
- provides=("${_replacesarchkernel%${_kernelname}}-docs")
- conflicts=("${_replacesarchkernel%${_kernelname}}-docs")
- replaces=("${_replacesarchkernel%${_kernelname}}-docs")
+ provides=("${_replacesarchkernel}-docs")
+ conflicts=("${_replacesarchkernel}-docs")
+ replaces=("${_replacesarchkernel}-docs")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-docs")
elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}")
conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
@@ -416,8 +419,10 @@ _package-smileplug() {
pkgdesc="The ${pkgbase^} kernel - Marvell SMILE Plug"
arch=('armv7h')
depends=("${pkgbase}")
- provides=("${_replacesarchkernel%${_kernelname}}-uimage")
- conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
+ provides=("${_replacesarchkernel}-uimage")
+ conflicts=("${_replacesarchkernel}-uimage")
+ replaces=("${_replacesarchkernel}-uimage")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -430,8 +435,10 @@ _package-mirabox() {
pkgdesc="The ${pkgbase^} kernel - Globalscale Mirabox"
arch=('armv7h')
depends=("${pkgbase}")
- provides=("${_replacesarchkernel%${_kernelname}}-uimage")
- conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
+ provides=("${_replacesarchkernel}-uimage")
+ conflicts=("${_replacesarchkernel}-uimage")
+ replaces=("${_replacesarchkernel}-uimage")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -444,8 +451,10 @@ _package-ax3() {
pkgdesc="The ${pkgbase^} kernel - OpenBlocks AX3-4"
arch=('armv7h')
depends=("${pkgbase}")
- provides=("${_replacesarchkernel%${_kernelname}}-uimage")
- conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
+ provides=("${_replacesarchkernel}-uimage")
+ conflicts=("${_replacesarchkernel}-uimage")
+ replaces=("${_replacesarchkernel}-uimage")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -458,8 +467,10 @@ _package-d3plug() {
pkgdesc="The ${pkgbase^} kernel - Globalscale D3Plug"
arch=('armv7h')
depends=("${pkgbase}")
- provides=("${_replacesarchkernel%${_kernelname}}-uimage")
- conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
+ provides=("${_replacesarchkernel}-uimage")
+ conflicts=("${_replacesarchkernel}-uimage")
+ replaces=("${_replacesarchkernel}-uimage")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -472,8 +483,10 @@ _package-cubox() {
pkgdesc="The ${pkgbase^} kernel - SolidRun Cubox (Marvell)"
arch=('armv7h')
depends=("${pkgbase}")
- provides=("${_replacesarchkernel%${_kernelname}}-uimage")
- conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
+ provides=("${_replacesarchkernel}-uimage")
+ conflicts=("${_replacesarchkernel}-uimage")
+ replaces=("${_replacesarchkernel}-uimage")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD
index 8cb4e3807..741eb2439 100644
--- a/libre-testing/linux-libre/PKGBUILD
+++ b/libre-testing/linux-libre/PKGBUILD
@@ -199,9 +199,10 @@ _package() {
depends=('coreutils' 'linux-libre-firmware' 'kmod')
optdepends=('crda: to set the correct wireless channels of your country')
if [ "${CARCH}" = "armv7h" ]; then
- provides=("${_replacesarchkernel%${_kernelname}}")
- conflicts=("${_replacesarchkernel%${_kernelname}}")
- replaces=("${_replacesarchkernel%${_kernelname}}")
+ provides=("${_replacesarchkernel}")
+ conflicts=("${_replacesarchkernel}")
+ replaces=("${_replacesarchkernel}")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}")
elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
depends+=('mkinitcpio>=0.7')
provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}")
@@ -279,9 +280,10 @@ _package() {
_package-headers() {
pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
if [ "${CARCH}" = "armv7h" ]; then
- provides=("${_replacesarchkernel%${_kernelname}}-headers")
- conflicts=("${_replacesarchkernel%${_kernelname}}-headers")
- replaces=("${_replacesarchkernel%${_kernelname}}-headers")
+ provides=("${_replacesarchkernel}-headers")
+ conflicts=("${_replacesarchkernel}-headers")
+ replaces=("${_replacesarchkernel}-headers")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-headers")
elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}")
conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
@@ -413,9 +415,10 @@ _package-headers() {
_package-docs() {
pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
if [ "${CARCH}" = "armv7h" ]; then
- provides=("${_replacesarchkernel%${_kernelname}}-docs")
- conflicts=("${_replacesarchkernel%${_kernelname}}-docs")
- replaces=("${_replacesarchkernel%${_kernelname}}-docs")
+ provides=("${_replacesarchkernel}-docs")
+ conflicts=("${_replacesarchkernel}-docs")
+ replaces=("${_replacesarchkernel}-docs")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-docs")
elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}")
conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
@@ -437,8 +440,10 @@ _package-smileplug() {
pkgdesc="The ${pkgbase^} kernel - Marvell SMILE Plug"
arch=('armv7h')
depends=("${pkgbase}")
- provides=("${_replacesarchkernel%${_kernelname}}-uimage")
- conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
+ provides=("${_replacesarchkernel}-uimage")
+ conflicts=("${_replacesarchkernel}-uimage")
+ replaces=("${_replacesarchkernel}-uimage")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -451,8 +456,10 @@ _package-mirabox() {
pkgdesc="The ${pkgbase^} kernel - Globalscale Mirabox"
arch=('armv7h')
depends=("${pkgbase}")
- provides=("${_replacesarchkernel%${_kernelname}}-uimage")
- conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
+ provides=("${_replacesarchkernel}-uimage")
+ conflicts=("${_replacesarchkernel}-uimage")
+ replaces=("${_replacesarchkernel}-uimage")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -465,8 +472,10 @@ _package-ax3() {
pkgdesc="The ${pkgbase^} kernel - OpenBlocks AX3-4"
arch=('armv7h')
depends=("${pkgbase}")
- provides=("${_replacesarchkernel%${_kernelname}}-uimage")
- conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
+ provides=("${_replacesarchkernel}-uimage")
+ conflicts=("${_replacesarchkernel}-uimage")
+ replaces=("${_replacesarchkernel}-uimage")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -479,8 +488,10 @@ _package-d3plug() {
pkgdesc="The ${pkgbase^} kernel - Globalscale D3Plug"
arch=('armv7h')
depends=("${pkgbase}")
- provides=("${_replacesarchkernel%${_kernelname}}-uimage")
- conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
+ provides=("${_replacesarchkernel}-uimage")
+ conflicts=("${_replacesarchkernel}-uimage")
+ replaces=("${_replacesarchkernel}-uimage")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"
@@ -493,8 +504,10 @@ _package-cubox() {
pkgdesc="The ${pkgbase^} kernel - SolidRun Cubox (Marvell)"
arch=('armv7h')
depends=("${pkgbase}")
- provides=("${_replacesarchkernel%${_kernelname}}-uimage")
- conflicts=("${_replacesarchkernel%${_kernelname}}-uimage")
+ provides=("${_replacesarchkernel}-uimage")
+ conflicts=("${_replacesarchkernel}-uimage")
+ replaces=("${_replacesarchkernel}-uimage")
+ [ "${pkgbase}" != "linux-libre" ] && conflicts+=("${_replacesarchkernel%${_kernelname}}-uimage")
cd "${srcdir}/${_srcname}"