diff options
Diffstat (limited to 'libre/linux-libre-grsec')
| -rw-r--r-- | libre/linux-libre-grsec/PKGBUILD | 53 |
1 files changed, 33 insertions, 20 deletions
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}" |