From db3f40d2e74e943131dc6571ea7436c4d70723fb Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 25 Nov 2019 19:14:02 -0300 Subject: updpkg: libre/linux-libre-pae 5.3.13_gnu-1 Signed-off-by: David P --- libre/linux-libre-pae/PKGBUILD | 49 +++++++++++++++++++----------------------- libre/linux-libre-pae/config | 5 ++++- 2 files changed, 26 insertions(+), 28 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-pae/PKGBUILD b/libre/linux-libre-pae/PKGBUILD index db679620a..60e5a5207 100644 --- a/libre/linux-libre-pae/PKGBUILD +++ b/libre/linux-libre-pae/PKGBUILD @@ -1,11 +1,6 @@ # Maintainer: David P # Contributor: André Silva -# Contributor: Nicolás Reynolds -# Contributor: Sorin-Mihai Vârgolici -# Contributor: Michał Masłowski # Contributor: Márcio Silva -# Contributor: Luke Shumaker -# Contributor: Luke R. # Based on linux-pae package @@ -14,22 +9,22 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-pae -_srcbasever=5.3-gnu -_srcver=5.3.8-gnu -_srcname=linux-${_srcbasever%-*} -pkgver=${_srcver//-/_} +pkgver=5.3.13_gnu pkgrel=1 +pkgdesc='Linux-libre PAE (physical address extension)' url='https://linux-libre.fsfla.org/' arch=(i686) license=(GPL2) makedepends=( - xmlto kmod inetutils bc libelf cpio + xmlto kmod inetutils bc libelf python-sphinx python-sphinx_rtd_theme graphviz imagemagick + cpio ) options=('!strip') +_srcname=linux-5.3 source=( - "https://linux-libre.fsfla.org/pub/linux-libre/releases/$_srcbasever/linux-libre-$_srcbasever.tar.xz"{,.sign} - "https://linux-libre.fsfla.org/pub/linux-libre/releases/$_srcver/patch-$_srcbasever-$_srcver.xz"{,.sign} + "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign} + "https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver//_/-}/patch-${_srcname##*-}-gnu-${pkgver//_/-}.xz"{,.sign} "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig} config # the main kernel config files @@ -51,7 +46,7 @@ validpgpkeys=( ) sha512sums=('85d83c973ef96ab414354414da70ab3e1c3df19c3088458498cec1594952878b7967a8988bd9e36d4e728cc573a36e6eac056dbcab2f9aa742f18cbb4fb3164f' 'SKIP' - 'eca168c4c460bf8d8fbf322e1aa9c6b509f205c7597142967648c09402de95c8438ae302b4920c8f120192b1a54286f0fb860955c66414f3a3c376e41f246391' + '3e9c95825f6852a0721a940c80b01b9772c17ae1680c1ce5a151e4f5b577a4a50f030aa0f2fbbc2b53b898b081bf33e67bfdeb513fe5535f95c4b479452264c3' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -59,7 +54,7 @@ sha512sums=('85d83c973ef96ab414354414da70ab3e1c3df19c3088458498cec1594952878b796 'SKIP' '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' 'SKIP' - '8f329e2d0735ab6e004ebf094c929c1f354a79809f6543ad6c41ed0d7967ad75733352d5a045e5880d34d57e2a436e73df82371d49fa997f154a57517b5cdcd6' + '6573f6f2a1cc3c2b3b084e57c70849b8153c4f1cdb745bfed596811e8b04e0080d7c2217b8f94ac254972b20a4ef9d60fe24ac8ef4c7b9ea330ab451c4d1f794' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' '5c48b0092ab6a31453e27e6345347fd2d066e1c306c4c8a9144260bf37d0d13879b5cfe688906a06627d39a40a37e229e5300a479b2c9159e93e05ea7adc6b0a' @@ -71,17 +66,17 @@ _replacesoldmodules=("${_replacesoldmodules[@]/\%/${pkgbase#linux-libre}}") export KBUILD_BUILD_HOST=parabola export KBUILD_BUILD_USER=$pkgbase -export KBUILD_BUILD_TIMESTAMP="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" prepare() { cd $_srcname - # add upstream patch - if [ "$_srcbasever" != "$_srcver" ]; then - patch -p1 -i ../patch-$_srcbasever-$_srcver + if [ "${_srcname##*-}-gnu" != "${pkgver//_/-}" ]; then + msg2 "Applying upstream patch..." + patch -p1 -i ../patch-${_srcname##*-}-gnu-${pkgver//_/-} fi - # add freedo as boot logo + msg2 "Adding freedo as boot logo..." install -m644 -t drivers/video/logo \ ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm} @@ -113,11 +108,11 @@ build() { } _package() { - pkgdesc="The ${pkgbase^} kernel and modules with PAE (physical address extension) support" + pkgdesc="The $pkgdesc kernel and modules" depends=(coreutils kmod initramfs) optdepends=('crda: to set the correct wireless channels of your country' 'linux-libre-firmware: firmware images needed for some devices') - provides=("${_replacesarchkernel[@]/%/=${_srcver%%-*}}" "LINUX-ABI_VERSION=${_srcver%%-*}") + provides=("${_replacesarchkernel[@]/%/=${pkgver%%_*}}" "LINUX-ABI_VERSION=${pkgver%%_*}") conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") @@ -144,8 +139,8 @@ _package() { } _package-headers() { - pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=("${_replacesarchkernel[@]/%/-headers=${_srcver%%-*}}") + pkgdesc="Header files and scripts for building modules for $pkgdesc kernel" + provides=("${_replacesarchkernel[@]/%/-headers=${pkgver%%_*}}") conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") @@ -223,8 +218,8 @@ _package-headers() { } _package-docs() { - pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=("${_replacesarchkernel[@]/%/-docs=${_srcver%%-*}}") + pkgdesc="Kernel hacker's manual for the $pkgdesc kernel" + provides=("${_replacesarchkernel[@]/%/-docs=${pkgver%%_*}}") conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") @@ -235,8 +230,8 @@ _package-docs() { mkdir -p "$builddir" cp -t "$builddir" -a Documentation - msg2 "Removing doctrees..." - rm -r "$builddir/Documentation/output/.doctrees" + msg2 "Removing unneeded files..." + rm -rv "$builddir"/Documentation/{,output/}.[^.]* msg2 "Moving HTML docs..." local src dst diff --git a/libre/linux-libre-pae/config b/libre/linux-libre-pae/config index d9a9ef74c..b707de99e 100644 --- a/libre/linux-libre-pae/config +++ b/libre/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.3.7-gnu Kernel Configuration +# Linux/x86 5.3.13-gnu Kernel Configuration # # @@ -437,6 +437,9 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y CONFIG_X86_INTEL_UMIP=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y -- cgit v1.2.3