From 6dfefe4710f3f437c7d046e6d347da34c296bc2c Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 28 May 2017 13:07:23 -0400 Subject: Some corrections to linux-libre-pck --- libre/linux-libre-pck/PKGBUILD | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD index 324908464..8f1099999 100644 --- a/libre/linux-libre-pck/PKGBUILD +++ b/libre/linux-libre-pck/PKGBUILD @@ -1,16 +1,18 @@ -# Maintainer: André Silva -# Maintainer: Márcio Silva +# Maintainer: David P. +# Maintainer: Jesús E. +# Contributor: André Silva +# Contributor: Márcio Silva # Contributor: Nicolás Reynolds # Contributor: Sorin-Mihai Vârgolici # Contributor: Michał Masłowski # Contributor: Luke Shumaker # Contributor: Luke R. -# Based on linux package +# Based on linux-zen package pkgbase=linux-libre-pck _pkgbasever=4.10-gnu -_pkgver=4.10.9-gnu +_pkgver=4.10.13-gnu _pckpatchver=pck1 _replacesarchkernel=('linux-zen') @@ -60,9 +62,9 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l '0009-disable-USB3-port-on-ODROID-XU.patch') sha512sums=('44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf5811fdae48fafd5a8e00d18ed9ac2e1ad4b12a657f322eb234384316ad131e0' 'SKIP' - '3b8bf353cd98417c6f0eac1a40b79cfdd59f772f9bd287bb59d809f7c0d8108dfe678c7662a896c31d8102cb5ffc47436570b93691b0b34b0b3baa0f0afa9d48' + 'ef0eb568775c55bde0f615237e827461aa8ee04cafb77783bc28fb6d040929f0802f53ad7c89b383342214fa080fc7e92b6f091cd7b695c5110615c0669ea3ea' 'SKIP' - '41d43a2ed993ea07bd719f40b67f96345666905f172fe22972f77474603c89ce0616727113eff09e126ae5ea6f9fe134863c124142986f0a2cee18b61e0373ef' + '990cd6c1a29d01bb77449b75de5d4aec4b3d3885e2fd17922e76a677f292f9ad3d6833c8b2efa3363710257c368e715204b58e6314035deb0c2c9f9f1c1efa9f' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -75,7 +77,7 @@ sha512sums=('44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf58 '9554a9b8c543ab5724fd2bf857553017e1366a6aa768c651d4e0c20c7b6bf3328675e46e37c7d63d090a26ccf2a174358b522c861833e1499a7780e00a742fac' 'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' - '1089ffb0718c6b40a6f2a3080845ebeb1a1561de35a28e46d74ab0232b98719400f85fdbf3a98fafd0105ed0fe11ec0bd726c7cc47a4a79767ab744875e9538e' + 'cf967533f4dffa8f403d67efeb83e8e33fd01b5b3bbc1c8ca1e416756eea6a27881a2b0d0347e6a660b480afa7a2a43d81f654d8729174556c68274de75ac31d' 'SKIP' '1d550ee87d3c35b4022c23feb771f9a40c34bead6eb8dc5e92cd767417723b32bcb7e0608419aa2b8a4f3306c183447d9ae713d33df68102b1c2df4e267cee39' 'cca509462861ac85e6229bd2bf5f5e0e4d2d2db182cf1d562f765862eb192ade5917a9e0306375642c1090143fae6826129fd531435658d906e6a8f88982ddef' @@ -111,10 +113,10 @@ prepare() { patch -p1 -i "${srcdir}/patch-${_pkgver}-${_pckpatchver}.patch" 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. + # See https://wiki.parabola.nu/PCK for further details. git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch" # ALARM patches @@ -171,14 +173,14 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules with a handful of awesome features not merged into mainline [AUFS, BFQ, BFS, Knock, UKSM]" - [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') - depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') + [ "${pkgbase}" = "linux" ] && groups=('base') + depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country' 'systemd-knock: to use system and service manager with TCP Stealth support' 'openssh-knock: to use SSH with TCP Stealth support') - provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}") - conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") - replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "kernel=${_archpkgver}") + conflicts=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -243,8 +245,8 @@ _package() { _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}") + conflicts=("${_replacesoldkernels[@]/%/-headers}") + replaces=("${_replacesoldkernels[@]/%/-headers}") install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" @@ -384,8 +386,8 @@ _package-headers() { _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}") + conflicts=("${_replacesoldkernels[@]/%/-docs}") + replaces=("${_replacesoldkernels[@]/%/-docs}") cd "${srcdir}/${_srcname}" -- cgit v1.2.3