summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cohen2022-03-06 21:38:31 -0600
committerDavid Cohen2022-03-06 21:38:31 -0600
commit498897bdfa05acfc003ba96403f2a8ab9fd890e0 (patch)
tree34489b541cfc69c7ae9a9c3ebf9070fc47883c30
parentbfe43f02b6aa8c52229f543157f834b9e11b5f55 (diff)
downloadaur-498897bdfa05acfc003ba96403f2a8ab9fd890e0.tar.gz
Update config
Add support for config.extra and enable the new AMD pstate driver. Signed-off-by: David Cohen <dacohen@pm.me>
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--config.extra4
3 files changed, 14 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bbdbe348a476..228b536486ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-mainline-git
pkgdesc = Linus Torvalds' Mainline Linux
- pkgver = v5.17.rc6.r46.719fce7539cd
+ pkgver = v5.17.rc7.r0.ffb217a13a2e
pkgrel = 1
url = https://www.kernel.org
arch = x86_64
@@ -20,12 +20,14 @@ pkgbase = linux-mainline-git
makedepends = imagemagick
makedepends = git
options = !strip
- source = linux-torvalds::git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+ source = linux-torvalds::git+https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux
source = config
+ source = config.extra
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = SKIP
sha256sums = a7e88715c86f2ea77e80cb0535d827406676cb8227a9367dd98931f511b06f31
+ sha256sums = 6c593d021527cef8f328cbce0da5a5dcd0d418468d93ff7aef43c700aad51349
pkgname = linux-mainline-git
pkgdesc = The Linus Torvalds' Mainline Linux kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 0293b77416b8..396165a9b717 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# This PKGBUILD script and the config file are based on Arch's linux package 5.16.11-arch1
pkgbase=linux-mainline-git
-pkgver=v5.17.rc6.r46.719fce7539cd
+pkgver=v5.17.rc7.r0.ffb217a13a2e
pkgrel=1
pkgdesc="Linus Torvalds' Mainline Linux"
url="https://www.kernel.org"
@@ -18,15 +18,17 @@ makedepends=(
options=('!strip')
_srcname=linux-torvalds
source=(
- "$_srcname::git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
+ "$_srcname::git+https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux"
config # the main kernel config file
+ config.extra # additional configs
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
sha256sums=('SKIP'
- 'a7e88715c86f2ea77e80cb0535d827406676cb8227a9367dd98931f511b06f31')
+ 'a7e88715c86f2ea77e80cb0535d827406676cb8227a9367dd98931f511b06f31'
+ '6c593d021527cef8f328cbce0da5a5dcd0d418468d93ff7aef43c700aad51349')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
@@ -55,7 +57,7 @@ prepare() {
done
echo "Setting config..."
- cp ../config .config
+ cat ../config ../config.extra > .config
make olddefconfig
diff -u ../config .config || :
diff --git a/config.extra b/config.extra
new file mode 100644
index 000000000000..20e860628240
--- /dev/null
+++ b/config.extra
@@ -0,0 +1,4 @@
+# The main config is based on official Arch's linux package.
+# This config file is modifying the base config.
+
+CONFIG_X86_AMD_PSTATE=y