5.5.15-2 (clr 5.5.14-928) update for virtualbox guest patches

This commit is contained in:
Josip Ponjavic 2020-04-03 18:34:59 +02:00
parent e8a27ead4e
commit 8b571ab4fe
2 changed files with 7 additions and 15 deletions

View file

@ -1,7 +1,7 @@
pkgbase = linux-clear pkgbase = linux-clear
pkgdesc = Clear Linux pkgdesc = Clear Linux
pkgver = 5.5.15 pkgver = 5.5.15
pkgrel = 1 pkgrel = 2
url = https://github.com/clearlinux-pkgs/linux url = https://github.com/clearlinux-pkgs/linux
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
@ -15,8 +15,7 @@ pkgbase = linux-clear
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.sign source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.sign
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.5.15.xz source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.5.15.xz
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.5.13-925 source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.5.14-928
source = https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200401.tar.xz
source = enable_additional_cpu_optimizations-20191217.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20191217.tar.gz source = enable_additional_cpu_optimizations-20191217.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20191217.tar.gz
source = pci-enable-overrides-for-missing-acs-capabilities.patch source = pci-enable-overrides-for-missing-acs-capabilities.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
@ -25,7 +24,6 @@ pkgbase = linux-clear
sha256sums = SKIP sha256sums = SKIP
sha256sums = 938b47e8e6c8e7ee091d0da149eab7cc63f3858bc7cc043ed4963771dc621b90 sha256sums = 938b47e8e6c8e7ee091d0da149eab7cc63f3858bc7cc043ed4963771dc621b90
sha256sums = SKIP sha256sums = SKIP
sha256sums = 7dfb4a8315e1d6ae406ff32d01c496175df558dd65968a19e5222d02c7cfb77a
sha256sums = 7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5 sha256sums = 7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5
sha256sums = 4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0 sha256sums = 4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0
@ -38,6 +36,7 @@ pkgname = linux-clear
optdepends = crda: to set the correct wireless channels of your country optdepends = crda: to set the correct wireless channels of your country
optdepends = linux-firmware: firmware images needed for some devices optdepends = linux-firmware: firmware images needed for some devices
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
provides = VIRTUALBOX-GUEST-MODULES
provides = WIREGUARD-MODULE provides = WIREGUARD-MODULE
pkgname = linux-clear-headers pkgname = linux-clear-headers

View file

@ -68,24 +68,22 @@ _use_current=
_major=5.5 _major=5.5
_minor=15 _minor=15
_srcname=linux-${_major} _srcname=linux-${_major}
_clr=${_major}.13-925 _clr=${_major}.14-928
pkgbase=linux-clear pkgbase=linux-clear
pkgver=${_major}.${_minor} pkgver=${_major}.${_minor}
pkgrel=1 pkgrel=2
pkgdesc='Clear Linux' pkgdesc='Clear Linux'
arch=('x86_64') arch=('x86_64')
url="https://github.com/clearlinux-pkgs/linux" url="https://github.com/clearlinux-pkgs/linux"
license=('GPL2') license=('GPL2')
makedepends=('bc' 'cpio' 'git' 'kmod' 'libelf' 'xmlto') makedepends=('bc' 'cpio' 'git' 'kmod' 'libelf' 'xmlto')
options=('!strip') options=('!strip')
_wrg_snap='1.0.20200401'
_gcc_more_v='20191217' _gcc_more_v='20191217'
source=( source=(
"https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz" "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz"
"https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.sign" "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.sign"
"https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz" "https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
"clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}" "clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}"
"https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${_wrg_snap}.tar.xz"
"enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
'pci-enable-overrides-for-missing-acs-capabilities.patch' 'pci-enable-overrides-for-missing-acs-capabilities.patch'
) )
@ -109,15 +107,11 @@ prepare() {
### Add Clearlinux patches ### Add Clearlinux patches
for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec |\ for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec |\
grep -Ev '^Patch0123|^Patch1001' | sed -n 's/.*: //p'); do grep -Ev '^Patch0123' | sed -n 's/.*: //p'); do
echo "Applying patch ${i}..." echo "Applying patch ${i}..."
patch -Np1 -i "$srcdir/clearlinux/${i}" patch -Np1 -i "$srcdir/clearlinux/${i}"
done done
### Link the WireGuard source directory into the kernel tree
echo "Adding the WireGuard source directory..."
"${srcdir}/wireguard-linux-compat-${_wrg_snap}/kernel-tree-scripts/jury-rig.sh" ./
local src local src
for src in "${source[@]}"; do for src in "${source[@]}"; do
src="${src%%::*}" src="${src%%::*}"
@ -243,7 +237,7 @@ _package() {
optdepends=('crda: to set the correct wireless channels of your country' optdepends=('crda: to set the correct wireless channels of your country'
'linux-firmware: firmware images needed for some devices' 'linux-firmware: firmware images needed for some devices'
'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig') 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig')
provides=('WIREGUARD-MODULE') provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
install=linux.install install=linux.install
cd $_srcname cd $_srcname
@ -353,7 +347,6 @@ sha256sums=('a6fbd4ee903c128367892c2393ee0d9657b6ed3ea90016d4dc6f1f6da20b2330'
'SKIP' 'SKIP'
'938b47e8e6c8e7ee091d0da149eab7cc63f3858bc7cc043ed4963771dc621b90' '938b47e8e6c8e7ee091d0da149eab7cc63f3858bc7cc043ed4963771dc621b90'
'SKIP' 'SKIP'
'7dfb4a8315e1d6ae406ff32d01c496175df558dd65968a19e5222d02c7cfb77a'
'7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5' '7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5'
'4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0') '4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0')