summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEggz2024-01-01 15:38:36 +0100
committerEggz2024-01-01 15:38:36 +0100
commit414ddf71d305b97be1c432c32e06dae8795deb71 (patch)
treefbd6b57559ba89862668c8d98c6f101131d61bed
parent217d0767045078129f0f450ba7c7e9dfc4e9699e (diff)
downloadaur-414ddf71d305b97be1c432c32e06dae8795deb71.tar.gz
Updated
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD30
-rw-r--r--config.x86_642
-rw-r--r--linux.install37
4 files changed, 7 insertions, 71 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f475f36f7614..e0e27f00b84b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-amd-znver3
- pkgver = 6.6.v.8
+ pkgver = 6.6.v.9
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -14,22 +14,19 @@ pkgbase = linux-amd-znver3
makedepends = lzop
makedepends = gcc>=9.1
options = !strip
- source = git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#tag=v6.6.8
+ source = git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#tag=v6.6.9
source = config.x86_64
source = linux-amd-znver3.preset
- source = linux.install
source = https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/20230105/more-uarches-for-kernel-5.17+.patch
source = flushbyasid.patch
sha256sums = SKIP
- sha256sums = ecaa3cd4c58c5d8183bdac008a60d8c9e66f27374edb712e7cf8ce751c33ea83
+ sha256sums = c1f435eb21c32ec6941140b84fd534c935bab96584b66a7b0b48ba40d5e71d9e
sha256sums = 26828ab61a69fca7ecdbba4179311f7cc3c59e1f8c070bcc626c68065187222b
- sha256sums = d590e751ab4cf424b78fd0d57e53d187f07401a68c8b468d17a5f39a337dacf0
sha256sums = 81ad663925a0aa5b5332a69bae7227393664bb81ee2e57a283e7f16e9ff75efe
sha256sums = 0878a970035793ca761c6f7499fb37cf04e6d9892758ca3fb9b99f846febfaf0
pkgname = linux-amd-znver3
pkgdesc = Linux kernel aimed at the znver3 AMD Ryzen CPU based hardware
- install = linux.install
depends = coreutils
depends = linux-firmware
depends = kmod
diff --git a/PKGBUILD b/PKGBUILD
index 522cdf3fa71f..0babc691e167 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
pkgbase=linux-amd-znver3
_srcname=linux
-gitver=v6.6.8
+gitver=v6.6.9
patchver=20230105
patchname=more-uarches-for-kernel-5.17+.patch
-pkgver=6.6.v.8
+pkgver=6.6.v.9
pkgrel=1
arch=('x86_64')
url="https://www.kernel.org/"
@@ -18,8 +18,6 @@ source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#ta
'config.x86_64'
# standard config files for mkinitcpio ramdisk
"${pkgbase}.preset"
- # linux package install directives for pacman
- 'linux.install'
# patch from our graysky archlinux colleague
"https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/$patchver/$patchname"
# nested KVM svm patch
@@ -27,11 +25,9 @@ source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#ta
)
sha256sums=('SKIP'
#config.x86_64
- 'ecaa3cd4c58c5d8183bdac008a60d8c9e66f27374edb712e7cf8ce751c33ea83'
+ 'c1f435eb21c32ec6941140b84fd534c935bab96584b66a7b0b48ba40d5e71d9e'
#.preset file
'26828ab61a69fca7ecdbba4179311f7cc3c59e1f8c070bcc626c68065187222b'
- #linux install file
- 'd590e751ab4cf424b78fd0d57e53d187f07401a68c8b468d17a5f39a337dacf0'
#grayskypatch
'81ad663925a0aa5b5332a69bae7227393664bb81ee2e57a283e7f16e9ff75efe'
#flushbyasid.patch
@@ -53,9 +49,6 @@ prepare() {
exit 2
fi
- # don't run depmod on 'make install'. We'll do this ourselves in packaging
- sed -i '2iexit 0' scripts/depmod.sh
-
# Implement all packaged patches and reverts.
msg2 "Implementing custom kernel patches/reverts"
while read patch; do
@@ -90,7 +83,6 @@ _package() {
depends=('coreutils' 'linux-firmware' 'kmod' 'lzop')
optdepends=('crda: to set the correct wireless channels of your country')
backup=("etc/mkinitcpio.d/${pkgbase}.preset")
- install=linux.install
cd "${_srcname}"
@@ -105,14 +97,6 @@ _package() {
make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
- # set correct depmod command for install
- cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
- true && install=${install}.pkg
- sed \
- -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
- -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
- -i "${startdir}/${install}"
-
# install mkinitcpio preset file for kernel
install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
sed \
@@ -126,14 +110,6 @@ _package() {
rm -f "${pkgdir}"/lib/modules/${_kernver}/build
# remove the firmware
rm -rf "${pkgdir}/lib/firmware"
- # make room for external modules
- ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
- # add real version for building modules and running depmod from post_install/upgrade
- mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}"
- echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version"
-
- # Now we call depmod...
- depmod -b "${pkgdir}" -F System.map "${_kernver}"
# move module tree /lib -> /usr/lib
mkdir -p "${pkgdir}/usr"
diff --git a/config.x86_64 b/config.x86_64
index 5b22d18549ff..8873ae421c92 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.8 Kernel Configuration
+# Linux/x86 6.6.9 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
CONFIG_CC_IS_GCC=y
diff --git a/linux.install b/linux.install
deleted file mode 100644
index ef42413835ac..000000000000
--- a/linux.install
+++ /dev/null
@@ -1,37 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-KERNEL_NAME=
-KERNEL_VERSION=
-
-post_install () {
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- depmod ${KERNEL_VERSION}
- echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
- mkinitcpio -p linux${KERNEL_NAME}
-}
-
-post_upgrade() {
- if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
- echo "WARNING: /boot appears to be a separate partition but is not mounted."
- fi
-
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- depmod ${KERNEL_VERSION}
- echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
- mkinitcpio -p linux${KERNEL_NAME}
-
- if [ $(vercmp $2 3.13) -lt 0 ]; then
- echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
- echo ">>> In order to use your keyboard during early init, you MUST"
- echo ">>> include the 'keyboard' hook in your mkinitcpio.conf."
- fi
-}
-
-post_remove() {
- # also remove the compat symlinks
- rm -f boot/initramfs-linux${KERNEL_NAME}.img
- rm -f boot/initramfs-linux${KERNEL_NAME}-fallback.img
-}