summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2018-07-02 21:42:20 -0400
committerDavid P <megver83@parabola.nu>2018-07-02 21:42:20 -0400
commit3c652460900f63b58b87b9e843aeb549edb2d28f (patch)
tree1b662cbec6e84e8a06b3cb29f136a312b5224d29 /libre
parent042958f0c20dc17ed7e48e093e8a7d94332aa7d3 (diff)
downloadabslibre-3c652460900f63b58b87b9e843aeb549edb2d28f.tar.gz
abslibre-3c652460900f63b58b87b9e843aeb549edb2d28f.tar.bz2
abslibre-3c652460900f63b58b87b9e843aeb549edb2d28f.zip
linux-libre-hardened: change the way to conflicts grsec kernels
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'libre')
-rw-r--r--libre/linux-libre-hardened/PKGBUILD11
1 files changed, 4 insertions, 7 deletions
diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD
index 28b506f86..237406d5b 100644
--- a/libre/linux-libre-hardened/PKGBUILD
+++ b/libre/linux-libre-hardened/PKGBUILD
@@ -13,7 +13,7 @@ _pkgver=4.17.3-gnu
_hardenedver=a
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
-_replacesoldkernels=() # '%' gets replaced with _kernelname
+_replacesoldkernels=('linux-grsec' 'linux-libre-grsec') # '%' gets replaced with _kernelname
_replacesoldmodules=() # '%' gets replaced with _kernelname
_srcname=linux-${_pkgbasever%-*}
@@ -72,10 +72,7 @@ sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447
'cc8852b089aa24f588ad1af726503ecd1012ad7e1cbc47ea77f03a5f7aecd25306d40f2e16b8a1afeafe7e2e97b6b6840c9f462ed7be358090117e2e024df1bd')
_kernelname=${pkgbase#linux-libre}
-_grsecname=-grsec
_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
-_replacesarchgrsec=("${_replacesarchkernel[@]/${_kernelname}/${_grsecname}}")
-_replacesgrsec=("${pkgbase/${_kernelname}/${_grsecname}}")
_replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}")
_replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}")
@@ -153,7 +150,7 @@ _package() {
optdepends=('crda: to set the correct wireless channels of your country')
provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_pkgver%%-*}")
conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
- replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}" "${_replacesarchgrsec[@]}" "${_replacesgrsec[@]}")
+ replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
backup=("etc/mkinitcpio.d/${pkgbase}.preset")
install=linux.install
@@ -211,7 +208,7 @@ _package-headers() {
pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}")
conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
- replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}" "${_replacesarchgrsec[@]/%/-headers}" "${_replacesgrsec[@]/%/-headers}")
+ replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
cd ${_srcname}
local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build"
@@ -281,7 +278,7 @@ _package-docs() {
pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}")
conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
- replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}" "${_replacesarchgrsec[@]/%/-docs}" "${_replacesgrsec[@]/%/-docs}")
+ replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
cd ${_srcname}
local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build"