diff options
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 17 | ||||
| -rwxr-xr-x | libre/linux-libre/linux-libre_kernels_parabola_version.sh | 28 |
2 files changed, 38 insertions, 7 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 241e576be..49fbcb8f2 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _pkgbasever=4.10-gnu -_pkgver=4.10.11-gnu +_pkgver=4.10.12-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -28,6 +28,8 @@ url="https://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'libelf') makedepends_armv7h=('git') +conflicts=('linux') +replaces=('linux') options=('!strip') source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" @@ -61,7 +63,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l '0009-disable-USB3-port-on-ODROID-XU.patch') sha512sums=('44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf5811fdae48fafd5a8e00d18ed9ac2e1ad4b12a657f322eb234384316ad131e0' 'SKIP' - '17b2fd74ce2485cee053e851687e83fe2d08fd3d6ebe0b8b9eed4919bd756f6be10024d9a2d713f0ded817f1170a04d5143869e46e72277dce612235de9de4af' + 'b0c542b4ae08fa3cdf7194cf6744e241162982b91ed31b01dfae03d879ebac7eba4e9434c065d500ca66e89a9f9f758c5854dc5aeecf667622932beabf80aa7c' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -112,10 +114,11 @@ prepare() { fi if [ "${CARCH}" = "armv7h" ]; then - # RCN patch (CM3 firmware deblobbed, AUFS and RT removed) - # Note: For stability reasons, AUFS and RT have been removed in the RCN patch. - # We are supporting AUFS in linux-libre-pck through PCK patch and RT through its official - # patch in linux-libre-rt. See https://wiki.parabola.nu/PCK for further details about PCK. + # RCN patch (CM3 firmware deblobbed and AUFS removed) + # Note: For stability reasons, AUFS has been removed in the RCN patch. + # We are supporting AUFS in linux-libre-pck through PCK patch through + # its official patch in linux-libre-rt. See https://wiki.parabola.nu/PCK + # for further details about PCK. git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch" # ALARM patches @@ -186,7 +189,7 @@ _package() { optdepends=('crda: to set the correct wireless channels of your country') provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "kernel=${_archpkgver}") conflicts=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") - replaces=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}" "${_replacesarchkernel[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install diff --git a/libre/linux-libre/linux-libre_kernels_parabola_version.sh b/libre/linux-libre/linux-libre_kernels_parabola_version.sh new file mode 100755 index 000000000..1a3800136 --- /dev/null +++ b/libre/linux-libre/linux-libre_kernels_parabola_version.sh @@ -0,0 +1,28 @@ +#!/usr/bin/bash + +# Copyright (C) 2015 André Silva <emulatorman@parabola.nu> +# Copyright (C) 2015 Márcio Silva <coadde@parabola.nu> +# +# License: GNU GPLv3+ +# +# This file is part of Parabola. +# +# Parabola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Parabola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Parabola. If not, see <http://www.gnu.org/licenses/>. + +for kernel in libre/linux-libre{,-lts,-grsec,-pck} kernels/linux-libre-{audit,grsec-{knock,xen},{lts-,}{apparmor,knock},nand,rt,pae,xen}; do + cd ~/packages/abslibre/$kernel + sed -i '\|replaces=| s|"${_replacesoldmodules\[@][/%a-z-]*}"|"${_replacesoldmodules[@]}" "${_replacesarchkernel[@]}" "${_replacesarchkernel[@]}"|' $(grep -rlI 'replaces') + sed -i '\|conflicts=| s|"${_conflictsoldmodules\[@][/%a-z-]*}"|"${_conflictsoldmodules[@]}" "${_conflictsarchkernel[@]}" "${_conflictsarchkernel[@]}"|' $(grep -rlI 'conflicts') + cd ~/packages/abslibre +done |