summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD19
-rw-r--r--asusbat.patch16
3 files changed, 32 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2e4e9f36e55e..e7c63b0cfd73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-amd
pkgver = 5.5.v.5
- pkgrel = 1
+ pkgrel = 2
url = https://www.kernel.org/
arch = x86_64
license = GPL2
@@ -16,10 +16,12 @@ pkgbase = linux-amd
source = config.x86_64
source = linux-amd.preset
source = 5012_enable-cpu-optimizations-for-gcc91.patch
+ source = asusbat.patch
sha256sums = SKIP
sha256sums = 58bfb5403694cd8058434b2483b6e944f276d1ff4dd5f1e90be92537e450388c
sha256sums = 71caf34adf69e9e2567a38cfc951d1c60b13dbe87f58a9acfeb3fe48ffdc9d08
sha256sums = cc739c9c9f7ce08e6bbc161b8232208bbc00820342a32fb1f69bff6326ae1370
+ sha256sums = c0a1604da4e0ae360f0c93a9adf244f9a8cffb5d219c94c0a58e23fb2c007a68
pkgname = linux-amd
pkgdesc = Linux kernel for AMD CPU based hardware
diff --git a/PKGBUILD b/PKGBUILD
index 0472172b9e1d..717ae5c086f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=linux-amd
_srcname=linux
gitver=v5.5.5
pkgver=5.5.v.5
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url="https://www.kernel.org/"
license=('GPL2')
@@ -21,14 +21,19 @@ source=('git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git'
"${pkgbase}.preset"
# patch from our gentoo overlords
5012_enable-cpu-optimizations-for-gcc91.patch
+ # asus WMI patch
+ asusbat.patch
+
)
sha256sums=('SKIP'
- #config.x86_64
+ #config.x86_64
'58bfb5403694cd8058434b2483b6e944f276d1ff4dd5f1e90be92537e450388c'
- #.preset file
- '71caf34adf69e9e2567a38cfc951d1c60b13dbe87f58a9acfeb3fe48ffdc9d08'
- #patch gentoo
- 'cc739c9c9f7ce08e6bbc161b8232208bbc00820342a32fb1f69bff6326ae1370'
+ #.preset file
+ '71caf34adf69e9e2567a38cfc951d1c60b13dbe87f58a9acfeb3fe48ffdc9d08'
+ #patch gentoo
+ 'cc739c9c9f7ce08e6bbc161b8232208bbc00820342a32fb1f69bff6326ae1370'
+ #Asusbat gitfile
+ 'c0a1604da4e0ae360f0c93a9adf244f9a8cffb5d219c94c0a58e23fb2c007a68'
)
_kernelname=${pkgbase#linux}
@@ -55,6 +60,8 @@ prepare() {
git apply ../5012_enable-cpu-optimizations-for-gcc91.patch
# get kernel version
yes "" | make prepare
+ # Implement suggested asus_wmi change
+ git apply ../asusbat.patch
# load configuration
# Configure the kernel. Replace the line below with one of your choice.
diff --git a/asusbat.patch b/asusbat.patch
new file mode 100644
index 000000000000..cf85eeb6e001
--- /dev/null
+++ b/asusbat.patch
@@ -0,0 +1,16 @@
+ drivers/platform/x86/asus-wmi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
+index 612ef5526226..12435e747a5d 100644
+--- a/drivers/platform/x86/asus-wmi.c
++++ b/drivers/platform/x86/asus-wmi.c
+@@ -427,7 +427,7 @@ static int asus_wmi_battery_add(struct power_supply *battery)
+ /* The WMI method does not provide a way to specific a battery, so we
+ * just assume it is the first battery.
+ */
+- if (strcmp(battery->desc->name, "BAT0") != 0)
++ if ( (strcmp(battery->desc->name, "BAT0") != 0) && (strcmp(battery->desc->name, "BATT") != 0) )
+ return -ENODEV;
+
+ if (device_create_file(&battery->dev,