5.4.7-1 (clr 5.4.6-883)
This commit is contained in:
Josip Ponjavic
parent
5ed0e8bd95
commit
ee9d671849
2 changed files with 15 additions and 14 deletions
12
.SRCINFO
12
.SRCINFO
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = linux-clear
|
||||
pkgdesc = Clear Linux
|
||||
pkgver = 5.4.6
|
||||
pkgver = 5.4.7
|
||||
pkgrel = 1
|
||||
url = https://github.com/clearlinux-pkgs/linux
|
||||
arch = x86_64
|
||||
|
|
@ -14,9 +14,9 @@ pkgbase = linux-clear
|
|||
options = !strip
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.sign
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.4.6.xz
|
||||
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.4.5-882
|
||||
source = https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20191219.tar.xz
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.4.7.xz
|
||||
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.4.6-883
|
||||
source = https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-0.0.20191226.tar.xz
|
||||
source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz
|
||||
source = pci-enable-overrides-for-missing-acs-capabilities.patch
|
||||
source = futex-wait-multiple-5.2.1.patch::https://aur.archlinux.org/cgit/aur.git/plain/futex-wait-multiple-5.2.1.patch?h=linux-fsync
|
||||
|
|
@ -25,9 +25,9 @@ pkgbase = linux-clear
|
|||
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
|
||||
sha256sums = bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
|
||||
sha256sums = SKIP
|
||||
sha256sums = 80853920a753762e058e35b754d3e0d16ec2fb485dfb84cc40fbdba383a8da17
|
||||
sha256sums = 7d99e8136518db0601abb7b59388c07838125901f540084d4575e87602544fd1
|
||||
sha256sums = SKIP
|
||||
sha256sums = 5aba6f0c38e97faa0b155623ba594bb0e4bd5e29deacd8d5ed8bda8d8283b0e7
|
||||
sha256sums = 7c0e576459c6337bcdea692bdbec561719a15da207dc739e0e3e60ff821a5491
|
||||
sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5
|
||||
sha256sums = 4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0
|
||||
sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942
|
||||
|
|
|
|||
17
PKGBUILD
17
PKGBUILD
|
|
@ -59,9 +59,9 @@ _localmodcfg=
|
|||
### IMPORTANT: Do no edit below this line unless you know what you're doing
|
||||
|
||||
_major=5.4
|
||||
_minor=6
|
||||
_minor=7
|
||||
_srcname=linux-${_major}
|
||||
_clr=${_major}.5-882
|
||||
_clr=${_major}.6-883
|
||||
pkgbase=linux-clear
|
||||
pkgver=${_major}.${_minor}
|
||||
pkgrel=1
|
||||
|
|
@ -71,14 +71,14 @@ url="https://github.com/clearlinux-pkgs/linux"
|
|||
license=('GPL2')
|
||||
makedepends=('bc' 'cpio' 'git' 'kmod' 'libelf' 'xmlto')
|
||||
options=('!strip')
|
||||
_wrg_snap='0.0.20191219'
|
||||
_wrg_snap='0.0.20191226'
|
||||
_gcc_more_v='20190822'
|
||||
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.sign"
|
||||
"https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
|
||||
"clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}"
|
||||
"https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${_wrg_snap}.tar.xz"
|
||||
"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"
|
||||
'pci-enable-overrides-for-missing-acs-capabilities.patch'
|
||||
'futex-wait-multiple-5.2.1.patch::https://aur.archlinux.org/cgit/aur.git/plain/futex-wait-multiple-5.2.1.patch?h=linux-fsync'
|
||||
|
|
@ -103,14 +103,15 @@ prepare() {
|
|||
echo "${pkgbase#linux}" > localversion.20-pkgname
|
||||
|
||||
### Add Clearlinux patches
|
||||
for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec | grep -Ev '^Patch0123|^Patch0130|^Patch1001' | sed -n 's/.*: //p'); do
|
||||
for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec |\
|
||||
grep -Ev '^Patch0123|^Patch0130|^Patch1001|^Patch0007|^Patch0008|^Patch0012' | sed -n 's/.*: //p'); do
|
||||
msg2 "Applying patch ${i}..."
|
||||
patch -Np1 -i "$srcdir/clearlinux/${i}"
|
||||
done
|
||||
|
||||
### Link the WireGuard source directory into the kernel tree
|
||||
msg2 "Adding the WireGuard source directory..."
|
||||
"${srcdir}/WireGuard-${_wrg_snap}/contrib/kernel-tree/jury-rig.sh" ./
|
||||
"${srcdir}/wireguard-linux-compat-${_wrg_snap}/kernel-tree-scripts/jury-rig.sh" ./
|
||||
|
||||
local src
|
||||
for src in "${source[@]}"; do
|
||||
|
|
@ -336,9 +337,9 @@ done
|
|||
|
||||
sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
|
||||
'SKIP'
|
||||
'80853920a753762e058e35b754d3e0d16ec2fb485dfb84cc40fbdba383a8da17'
|
||||
'7d99e8136518db0601abb7b59388c07838125901f540084d4575e87602544fd1'
|
||||
'SKIP'
|
||||
'5aba6f0c38e97faa0b155623ba594bb0e4bd5e29deacd8d5ed8bda8d8283b0e7'
|
||||
'7c0e576459c6337bcdea692bdbec561719a15da207dc739e0e3e60ff821a5491'
|
||||
'8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
|
||||
'4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0'
|
||||
'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942'
|
||||
|
|
|
|||
Reference in a new issue