summaryrefslogtreecommitdiff
path: root/kernels
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 /kernels
parentb1e4c27b0babd309c2024626a53faac832c81e02 (diff)
downloadabslibre-696e3f83a0153fed08934e1b83f3489c00355440.tar.gz
abslibre-696e3f83a0153fed08934e1b83f3489c00355440.tar.bz2
abslibre-696e3f83a0153fed08934e1b83f3489c00355440.zip
fix conflicts between armv7h kernels
Diffstat (limited to 'kernels')
-rw-r--r--kernels/linux-libre-grsec-knock/PKGBUILD53
-rw-r--r--kernels/linux-libre-lts-knock/PKGBUILD51
-rw-r--r--kernels/linux-libre-rt/PKGBUILD51
3 files changed, 97 insertions, 58 deletions
diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD
index 1fcf3a784..f3a710ed1 100644
--- a/kernels/linux-libre-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-grsec-knock/PKGBUILD
@@ -158,7 +158,7 @@ prepare() {
# Make the radeon driver load without the firmwares
# http://www.fsfla.org/pipermail/linux-libre/2015-August/003098.html
if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then ## This patch is only needed for x86 computers, so we disable it for others
- patch -Np1 -i ../0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
+ patch -p1 -i "${srcdir}/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch"
fi
cat "${srcdir}/config.${CARCH}" > ./.config
@@ -204,9 +204,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}}")
@@ -293,9 +294,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}")
@@ -427,9 +429,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}")
@@ -451,8 +454,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}"
@@ -465,8 +470,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}"
@@ -479,8 +486,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}"
@@ -493,8 +502,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}"
@@ -507,8 +518,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/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index 7a2417ab0..b98afccd4 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -192,9 +192,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}}")
@@ -272,9 +273,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}")
@@ -406,9 +408,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}")
@@ -430,8 +433,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}"
@@ -444,8 +449,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}"
@@ -458,8 +465,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}"
@@ -472,8 +481,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}"
@@ -486,8 +497,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/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index b6dab9fec..64253afe2 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -192,9 +192,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}}")
@@ -272,9 +273,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}")
@@ -406,9 +408,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}")
@@ -430,8 +433,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}"
@@ -444,8 +449,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}"
@@ -458,8 +465,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}"
@@ -472,8 +481,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}"
@@ -486,8 +497,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}"