diff options
-rw-r--r-- | kernels/linux-libre-grsec-knock/PKGBUILD | 53 | ||||
-rw-r--r-- | kernels/linux-libre-lts-knock/PKGBUILD | 51 | ||||
-rw-r--r-- | kernels/linux-libre-rt/PKGBUILD | 51 | ||||
-rw-r--r-- | libre-testing/linux-libre-pck/PKGBUILD | 51 | ||||
-rw-r--r-- | libre-testing/linux-libre/PKGBUILD | 51 | ||||
-rw-r--r-- | libre/linux-libre-grsec/PKGBUILD | 53 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 51 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 59 |
8 files changed, 262 insertions, 158 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}" 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}" diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 38389b70b..3519c9be9 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -147,7 +147,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 @@ -191,9 +191,10 @@ _package() { 'gradm: to configure and enable Role Based Access Control (RBAC)' 'paxd-libre: to enable PaX exploit mitigations and apply exceptions automatically') 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}}") @@ -280,9 +281,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}") @@ -414,9 +416,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}") @@ -438,8 +441,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}" @@ -452,8 +457,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}" @@ -466,8 +473,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}" @@ -480,8 +489,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}" @@ -494,8 +505,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/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 7411ad60f..64365b7b4 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -179,9 +179,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}}") @@ -259,9 +260,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}") @@ -393,9 +395,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}") @@ -417,8 +420,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}" @@ -431,8 +436,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}" @@ -445,8 +452,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}" @@ -459,8 +468,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}" @@ -473,8 +484,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/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index c8ac046f3..3d05f63aa 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -14,13 +14,13 @@ _pkgbasever=4.1-gnu _pkgver=4.1.6-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname -_replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname -_replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname +_replacesoldkernels=() # '%' gets replaced with _kernelname +_replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1.1 +pkgrel=1.2 rcnrel=armv7-x2 arch=('i686' 'x86_64' 'armv7h') url="http://linux-libre.fsfla.org/" @@ -138,7 +138,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 @@ -180,9 +180,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}}") @@ -260,9 +261,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}") @@ -394,9 +396,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}") @@ -418,8 +421,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}" @@ -432,8 +437,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}" @@ -446,8 +453,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}" @@ -460,8 +469,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}" @@ -474,8 +485,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}" |