diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | linux.install | 5 |
3 files changed, 10 insertions, 18 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-clear pkgver = 5.2.9 - pkgrel = 5 + pkgrel = 6 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 license = GPL2 @@ -9,14 +9,12 @@ pkgbase = linux-clear makedepends = inetutils makedepends = kmod makedepends = libelf - makedepends = linux-firmware makedepends = xmlto options = !strip source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.sign source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.2.9.xz - source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.2.9-823 - source = intel-ucode-20190618.tar.gz::https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190618.tar.gz + source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.2.9-825 source = enable_additional_cpu_optimizations-20190714.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190714.tar.gz source = add-acs-overrides.patch::https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio source = 60-linux.hook @@ -29,7 +27,6 @@ pkgbase = linux-clear sha256sums = SKIP sha256sums = 7edb11f988c1fa13c1c5e75fb42a3b73f02cdd97ceb3459fc942803f643f1f13 sha256sums = SKIP - sha256sums = 74ec7415988d40fa53686d994cf8cb27accdbd35c5373c4c3afc2e93372ebba5 sha256sums = 2466fb4aecc66d1b258b4cbdb2f215b5099f266d8c4386bb62ad1a0acd0caf5b sha256sums = dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 @@ -65,23 +65,21 @@ _enable_acs_override="y" _major=5.2 _minor=9 _srcname=linux-${_major} -_clr=${_major}.9-823 +_clr=${_major}.9-825 pkgbase=linux-clear pkgver=${_major}.${_minor} -pkgrel=5 +pkgrel=6 arch=('x86_64') url="https://github.com/clearlinux-pkgs/linux" license=('GPL2') -makedepends=('bc' 'git' 'inetutils' 'kmod' 'libelf' 'linux-firmware' 'xmlto') +makedepends=('bc' 'git' 'inetutils' 'kmod' 'libelf' 'xmlto') options=('!strip') -_ucode='20190618' _gcc_more_v='20190714' 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}" - "intel-ucode-${_ucode}.tar.gz::https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${_ucode}.tar.gz" "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" 'add-acs-overrides.patch::https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio' '60-linux.hook' # pacman hook for depmod @@ -131,13 +129,6 @@ CONFIG_MODULE_COMPRESS_XZ=y|' ./.config make olddefconfig - ### Copying i915 firmware and intel-ucode - msg2 "Copying i915 firmware and intel-ucode-${_ucode}..." - cp -a /usr/lib/firmware/i915 firmware/ - cp -a ${srcdir}/Intel-Linux-Processor-Microcode-Data-Files-microcode-${_ucode}/intel-ucode firmware/ - cp ${srcdir}/Intel-Linux-Processor-Microcode-Data-Files-microcode-${_ucode}/intel-ucode-with-caveats/06* firmware/intel-ucode/ - rm -f firmware/intel-ucode/0f* - ### Patch source to unlock additional gcc CPU optimizations # https://github.com/graysky2/kernel_gcc_patch if [ "${_enable_gcc_more_v}" = "y" ]; then @@ -345,7 +336,6 @@ sha256sums=('54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7' 'SKIP' '7edb11f988c1fa13c1c5e75fb42a3b73f02cdd97ceb3459fc942803f643f1f13' 'SKIP' - '74ec7415988d40fa53686d994cf8cb27accdbd35c5373c4c3afc2e93372ebba5' '2466fb4aecc66d1b258b4cbdb2f215b5099f266d8c4386bb62ad1a0acd0caf5b' 'dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' diff --git a/linux.install b/linux.install index f15febe2ff38..0840849386a1 100644 --- a/linux.install +++ b/linux.install @@ -4,6 +4,10 @@ _5_2_2_2_changes() { echo ':: Kernel command line update: add page_alloc.shuffle=1' } +_5_2_9_6_changes() { + echo ':: Microcode is no longer builtin. https://wiki.archlinux.org/index.php/Microcode' +} + post_install() { echo ":: Adjust kernel command line in your bootloader to Clear Linux kernel default:" echo " quiet console=tty0 console=ttyS0,115200n8 cryptomgr.notests initcall_debug" @@ -19,6 +23,7 @@ post_upgrade() { local v upgrades=( 5.2.2-2 + 5.2.9-6 ) for v in "${upgrades[@]}"; do |