5.6.13-3 (clr 5.6.13-952) add rebase gcc patch
This commit is contained in:
parent
9d51bd9988
commit
b97b9ce9f2
2 changed files with 11 additions and 17 deletions
6
.SRCINFO
6
.SRCINFO
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = linux-clear
|
pkgbase = linux-clear
|
||||||
pkgdesc = Clear Linux
|
pkgdesc = Clear Linux
|
||||||
pkgver = 5.6.13
|
pkgver = 5.6.13
|
||||||
pkgrel = 2
|
pkgrel = 3
|
||||||
url = https://github.com/clearlinux-pkgs/linux
|
url = https://github.com/clearlinux-pkgs/linux
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = GPL2
|
license = GPL2
|
||||||
|
@ -16,7 +16,7 @@ pkgbase = linux-clear
|
||||||
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.sign
|
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.sign
|
||||||
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.6.13.xz
|
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.6.13.xz
|
||||||
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.6.13-952
|
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.6.13-952
|
||||||
source = enable_additional_cpu_optimizations-20191217.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20191217.tar.gz
|
source = enable_additional_cpu_optimizations_for_gcc_v10.1+_kernel_v5.4-5.6_v1.patch
|
||||||
source = pci-enable-overrides-for-missing-acs-capabilities.patch
|
source = pci-enable-overrides-for-missing-acs-capabilities.patch
|
||||||
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
|
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
|
||||||
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
|
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
|
||||||
|
@ -24,7 +24,7 @@ pkgbase = linux-clear
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = d8604aec02928a19e213af003977108e4b93935762b178f86da9e7c18e6cebac
|
sha256sums = d8604aec02928a19e213af003977108e4b93935762b178f86da9e7c18e6cebac
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = 7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5
|
sha256sums = c650fc6ff773e99dbc1fda9411b10b06513c5161791106c44d5a11dbcf6420f9
|
||||||
sha256sums = 2c98de0814366b041aeee4cbf82b82620c7834bc33752d50f089e8bd7ea5cf5e
|
sha256sums = 2c98de0814366b041aeee4cbf82b82620c7834bc33752d50f089e8bd7ea5cf5e
|
||||||
|
|
||||||
pkgname = linux-clear
|
pkgname = linux-clear
|
||||||
|
|
22
PKGBUILD
22
PKGBUILD
|
@ -71,20 +71,19 @@ _srcname=linux-${_major}
|
||||||
_clr=${_major}.13-952
|
_clr=${_major}.13-952
|
||||||
pkgbase=linux-clear
|
pkgbase=linux-clear
|
||||||
pkgver=${_major}.${_minor}
|
pkgver=${_major}.${_minor}
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
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')
|
||||||
_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}"
|
||||||
"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_for_gcc_v10.1+_kernel_v5.4-5.6_v1.patch'
|
||||||
'pci-enable-overrides-for-missing-acs-capabilities.patch'
|
'pci-enable-overrides-for-missing-acs-capabilities.patch'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -111,14 +110,9 @@ prepare() {
|
||||||
patch -Np1 -i "$srcdir/clearlinux/${i}"
|
patch -Np1 -i "$srcdir/clearlinux/${i}"
|
||||||
done
|
done
|
||||||
|
|
||||||
local src
|
### Add acs patch
|
||||||
for src in "${source[@]}"; do
|
echo "Applying pci-enable-overrides-for-missing-acs-capabilities.patch ..."
|
||||||
src="${src%%::*}"
|
patch -Np1 -i "$srcdir/pci-enable-overrides-for-missing-acs-capabilities.patch"
|
||||||
src="${src##*/}"
|
|
||||||
[[ $src = *.patch ]] || continue
|
|
||||||
echo "Applying patch $src..."
|
|
||||||
patch -Np1 < "../$src"
|
|
||||||
done
|
|
||||||
|
|
||||||
### Setting config
|
### Setting config
|
||||||
echo "Setting config..."
|
echo "Setting config..."
|
||||||
|
@ -174,8 +168,8 @@ prepare() {
|
||||||
### Patch source to unlock additional gcc CPU optimizations
|
### Patch source to unlock additional gcc CPU optimizations
|
||||||
# https://github.com/graysky2/kernel_gcc_patch
|
# https://github.com/graysky2/kernel_gcc_patch
|
||||||
if [ "${_enable_gcc_more_v}" = "y" ]; then
|
if [ "${_enable_gcc_more_v}" = "y" ]; then
|
||||||
echo "Applying enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v5.5+.patch ..."
|
echo "Applying enable_additional_cpu_optimizations_for_gcc_v10.1+_kernel_v5.4-5.6_v1.patch ..."
|
||||||
patch -Np1 -i "$srcdir/kernel_gcc_patch-$_gcc_more_v/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v5.5+.patch"
|
patch -Np1 -i "$srcdir/enable_additional_cpu_optimizations_for_gcc_v10.1+_kernel_v5.4-5.6_v1.patch"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### Get kernel version
|
### Get kernel version
|
||||||
|
@ -349,7 +343,7 @@ sha256sums=('e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'd8604aec02928a19e213af003977108e4b93935762b178f86da9e7c18e6cebac'
|
'd8604aec02928a19e213af003977108e4b93935762b178f86da9e7c18e6cebac'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5'
|
'c650fc6ff773e99dbc1fda9411b10b06513c5161791106c44d5a11dbcf6420f9'
|
||||||
'2c98de0814366b041aeee4cbf82b82620c7834bc33752d50f089e8bd7ea5cf5e')
|
'2c98de0814366b041aeee4cbf82b82620c7834bc33752d50f089e8bd7ea5cf5e')
|
||||||
|
|
||||||
validpgpkeys=(
|
validpgpkeys=(
|
||||||
|
|
Reference in a new issue