diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/linux-libre-hardened/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/linux-libre-pck/PKGBUILD | 20 |
2 files changed, 14 insertions, 15 deletions
diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD index b1db2a750..682955274 100644 --- a/libre/linux-libre-hardened/PKGBUILD +++ b/libre/linux-libre-hardened/PKGBUILD @@ -1,5 +1,4 @@ # Maintainer: David P. <megver83@parabola.nu> -# Maintainer: Jesús E. <heckyel@openmailbox.org> # Contributor: André Silva <emulatorman@hyperbola.info> # Contributor: Márcio Silva <coadde@hyperbola.info> # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -12,7 +11,7 @@ pkgbase=linux-libre-hardened _pkgbasever=4.13-gnu -_pkgver=4.13.8-gnu +_pkgver=4.13.9-gnu _hardenedver=a _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -45,7 +44,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' '0002-fix-Atmel-maXTouch-touchscreen-support.patch' # armv7h patches - "https://repo.parabola.nu/other/rcn-libre-hardened/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"{,.sig} + "https://repo.parabola.nu/other/rcn-libre-hardened/patches/${_pkgver%-*}/rcn-libre-hardened-${_pkgver%-*}-${rcnrel}.patch"{,.sig} '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' '0003-SMILE-Plug-device-tree-file.patch' @@ -57,7 +56,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l '0009-ARM-dove-enable-ethernet-on-D3Plug.patch') sha512sums=('9ad6866c68f29f7e4f8b53d0b857f9b3c7f6abd0054460675c76f3100db34a77c2777d7f4191831008b532cb2ab6f686d8c4f457a4d005226c73f90937963518' 'SKIP' - 'd86cf42fce2e82180517a1cefd84ae37484c78d0852086af341e12c2b19d5068075a38375a9c55cfe7c6c1ef169ae01b94d6bd856602efbf089d59ff1d356082' + '12221d0eb85f30eace8fac389c27d3455df11475c466b600c466a2cb843435a406cf663547cb7a0aa8340ac4bd178ba4e694136e5172c1c396bd033ab840ac4e' 'SKIP' '7b85ed41fdd8effba2284175fdfaea087cf5a491e8940cdb289aa4ba5fcb5e54d3595f612e943e99e42cbbbd39d6167c5032c07e05901eb1c25dd25219bdd2c7' 'SKIP' @@ -114,7 +113,7 @@ prepare() { # 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" + git apply -v "${srcdir}/rcn-libre-hardened-${_pkgver%-*}-${rcnrel}.patch" # ALARM patches patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch" diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD index 5eda33f10..bc2a4f320 100644 --- a/libre/linux-libre-pck/PKGBUILD +++ b/libre/linux-libre-pck/PKGBUILD @@ -1,5 +1,4 @@ # Maintainer: David P. <megver83@parabola.nu> -# Maintainer: Jesús E. <heckyel@parabola.nu> # Contributor: André Silva <emulatorman@hyperbola.info> # Contributor: Márcio Silva <coadde@hyperbola.info> # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -12,7 +11,7 @@ pkgbase=linux-libre-pck _pkgbasever=4.13-gnu -_pkgver=4.13.5-gnu +_pkgver=4.13.9-gnu _pckpatchver=pck1 _replacesarchkernel=('linux-zen') @@ -23,11 +22,11 @@ _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_}.${_pckpatchver} pkgrel=1 -rcnrel=armv7-x1 +rcnrel=armv7-x2 arch=('i686' 'x86_64' 'armv7h') url="https://wiki.parabola.nu/PCK" license=('GPL2') -makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf' 'gcc6') +makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf') makedepends_armv7h=('git') options=('!strip') source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"{,.sign} @@ -55,9 +54,9 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l '0009-ARM-dove-enable-ethernet-on-D3Plug.patch') sha512sums=('9ad6866c68f29f7e4f8b53d0b857f9b3c7f6abd0054460675c76f3100db34a77c2777d7f4191831008b532cb2ab6f686d8c4f457a4d005226c73f90937963518' 'SKIP' - '2d6eddb52bf160cbaeec203e7b0a77f4230f7e1995f17524f6164a8eaacf19340663be1f23e38ea3b0eb2e2504b48eb2371d89419e15f2b7c9371a189c95710d' + '12221d0eb85f30eace8fac389c27d3455df11475c466b600c466a2cb843435a406cf663547cb7a0aa8340ac4bd178ba4e694136e5172c1c396bd033ab840ac4e' 'SKIP' - '1735e55976112c3b4d1db92e5cbaf408031afa9e11e8a4167dc0e4ce130410db0621c0d3991827a7617cefdf17dc99071a1dcb09668d80ad30a46a7e599a33b6' + 'b2c91fb6613f7dfa9c2e0d5644d0a7297b0a8af82c5990809b70dc512bde0cef42e82e951c61d7deb767baf01d618597a04f92355484f2c198f91b4568f6ead2' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -70,7 +69,7 @@ sha512sums=('9ad6866c68f29f7e4f8b53d0b857f9b3c7f6abd0054460675c76f3100db34a77c27 '55cebbbc7d65337419f0c0f9f0685a466d6296e09d1df7a53761bf741a7881a1cb559b7528bb30e6e11484aef0027d105649da6a53665329477a1a24a604336f' 'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' - '9ce4124257d446ba6cf6b2e7adffbd3d92326ac761a49ce47395310afe3ada1a0d6138f4f355af2a4a752920d59577a03483399bd5650e4b6de2018e394e59de' + '1507b924cfc415398ee8972d61d669e501481e95a41d4851aae467f2e8894760842b0b89e1dad4f0791abe85d0e67fa995eefbfcf716ace8acbe8626a1d57314' 'SKIP' '8da49af5cce12f0bf21f5985cf85d13624404bab76cc0fd7a04b3ee6c046b5dceb4ae0bb821e060405366310473042892e716f530f04d1dab9a21ca1f778dd6c' '06f40e0f197b15dffc7c724aba9a41f2343c8528576700202f069d5cd00013e7e5e8d62153cf358d02c21e28d7cf2a66e3f5190677cb590ac07f36be58b43cab' @@ -157,14 +156,15 @@ build() { cd ${_srcname} if [ "${CARCH}" = "armv7h" ]; then - CC="gcc-6" CXX="g++-6" make ${MAKEFLAGS} LOCALVERSION= zImage modules dtbs + make ${MAKEFLAGS} LOCALVERSION= zImage modules dtbs elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then - CC="gcc-6" CXX="g++-6" make ${MAKEFLAGS} LOCALVERSION= bzImage modules + make ${MAKEFLAGS} LOCALVERSION= bzImage modules fi } _package() { - pkgdesc="The ${pkgbase^} kernel and modules with a handful of awesome features not merged into mainline [AUFS, BFQ, BFS, Knock, UKSM]" +# pkgdesc="The ${pkgbase^} kernel and modules with a handful of awesome features not merged into mainline [AUFS, BFQ, BFS, Knock, UKSM]" + pkgdesc="The ${pkgbase^} kernel and modules with a handful of awesome features not merged into mainline [AUFS, BFQ, BFS, UKSM]" # Knock has been removed for now [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country' |