Skip to content

Commit f633ca5

Browse files
committed
fix claw patch compile error, return einval when invalid state is input
1 parent dcb7f05 commit f633ca5

File tree

2 files changed

+97
-5
lines changed

2 files changed

+97
-5
lines changed

handheld.patch

Lines changed: 96 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,95 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Antheas Kapenekakis <[email protected]>
3+
Date: Fri, 15 Nov 2024 20:54:57 +0100
4+
Subject: [NA] add dev tools
5+
6+
---
7+
.gitignore | 4 ++++
8+
sync-arch.sh | 20 ++++++++++++++++++++
9+
sync.sh | 30 ++++++++++++++++++++++++++++++
10+
3 files changed, 54 insertions(+)
11+
create mode 100755 sync-arch.sh
12+
create mode 100755 sync.sh
13+
14+
diff --git a/.gitignore b/.gitignore
15+
index 8cd8290c6c93..9c64f0bcd8ac 100644
16+
--- a/.gitignore
17+
+++ b/.gitignore
18+
@@ -188,3 +188,7 @@ sphinx_*/
19+
20+
# Rust analyzer configuration
21+
/rust-project.json
22+
+
23+
+# Bazzite Dev stuff
24+
+cert.der
25+
+key.*
26+
\ No newline at end of file
27+
diff --git a/sync-arch.sh b/sync-arch.sh
28+
new file mode 100755
29+
index 000000000000..dd2e678fdcbd
30+
--- /dev/null
31+
+++ b/sync-arch.sh
32+
@@ -0,0 +1,20 @@
33+
+# if [ -z "$1" ]; then
34+
+# echo "Usage: $0 <host>"
35+
+# exit 1
36+
+# fi
37+
+
38+
+HOST=tbx
39+
+USER=${USER:-dev}
40+
+
41+
+set -e
42+
+rm -rf linux-*
43+
+
44+
+time PATH="/usr/lib/ccache/bin:$PATH" CCACHE_DIR=$(pwd)/../cache CCACHE_FILECLONE=1 CCACHE_MAXSIZE=30G make pacman-pkg -j 14
45+
+scp linux-*.pkg.tar.zst $HOST:/tmp
46+
+
47+
+ssh $HOST /bin/bash << EOF
48+
+ yay --noconfirm -U /tmp/linux-upstream-6* /tmp/linux-upstream-headers-6*
49+
+ rm -rf /tmp/linux-upstream-6* /tmp/linux-upstream-headers-6*
50+
+ sudo reboot
51+
+EOF
52+
+
53+
diff --git a/sync.sh b/sync.sh
54+
new file mode 100755
55+
index 000000000000..de610a8bc34b
56+
--- /dev/null
57+
+++ b/sync.sh
58+
@@ -0,0 +1,30 @@
59+
+if [ -z "$1" ]; then
60+
+ echo "Usage: $0 <host>"
61+
+ exit 1
62+
+fi
63+
+
64+
+HOST=$1
65+
+USER=${USER:-bazzite}
66+
+
67+
+# openssl req -new -x509 -newkey rsa:2048 -keyout "key.pem" \
68+
+# -outform DER -out "cert.der" -nodes -days 36500 \
69+
+# -subj "/CN=antheas/"
70+
+# openssl x509 -in cert.der -inform DER -outform PEM -out key.cert.pem
71+
+
72+
+# scp cert.der $host:/tmp/cert.der
73+
+# sudo mokutil --import "/tmp/cert.der"
74+
+
75+
+make binrpm-pkg -j $(nproc)
76+
+# sudo sbsign --key key.pem --cert key.cert.pem ./arch/x86/boot/bzImage --output vmlinuz
77+
+
78+
+# scp vmlinuz $HOST:/tmp/vmlinuz
79+
+
80+
+# ssh $HOST /bin/bash << EOF
81+
+# sudo cp /tmp/vmlinuz /boot/vmlinuz
82+
+# sed -E 's#linux /ostree/.+\$#linux /vmlinuz#g' \
83+
+# /boot/loader/entries/ostree-2.conf | \
84+
+# sed -E 's#^title #title Kernel Swap of #g' | \
85+
+# sed -E 's#^version \\d#version 200#g' | \
86+
+# sudo tee /boot/loader/entries/ostree-100.conf
87+
+# sudo reboot
88+
+# EOF
89+
--
90+
2.47.0
91+
92+
193
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
294
From: Antheas Kapenekakis <[email protected]>
395
Date: Sat, 12 Oct 2024 19:02:51 +0200
@@ -35294,7 +35386,7 @@ Signed-off-by: Antheas Kapenekakis <[email protected]>
3529435386
1 file changed, 71 insertions(+)
3529535387

3529635388
diff --git a/kernel/power/main.c b/kernel/power/main.c
35297-
index a9e0693aaf69..cc0348c052fe 100644
35389+
index a9e0693aaf69..0c8307f0d0e3 100644
3529835390
--- a/kernel/power/main.c
3529935391
+++ b/kernel/power/main.c
3530035392
@@ -746,6 +746,76 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
@@ -35354,7 +35446,7 @@ index a9e0693aaf69..cc0348c052fe 100644
3535435446
+ return state;
3535535447
+ }
3535635448
+
35357-
+ return PM_STANDBY_ACTIVE;
35449+
+ return PM_STANDBY_MAX;
3535835450
+}
3535935451
+
3536035452
+static ssize_t standby_store(struct kobject *kobj, struct kobj_attribute *attr,
@@ -35396,14 +35488,14 @@ Subject: [TEMPORARY] Add s2idle delays for MSI Claw
3539635488
1 file changed, 13 insertions(+)
3539735489

3539835490
diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
35399-
index b3242fa77be6..b8d3df14a538 100644
35491+
index b3242fa77be6..0fe2c9cf2d04 100644
3540035492
--- a/drivers/acpi/x86/s2idle.c
3540135493
+++ b/drivers/acpi/x86/s2idle.c
3540235494
@@ -112,6 +112,13 @@ static const struct s2idle_delay_quirks rog_ally_quirks = {
3540335495
.delay_sleep_entry = 150,
3540435496
};
3540535497

35406-
+static const struct platform_s2idle_quirks msi_claw_quirks = {
35498+
+static const struct s2idle_delay_quirks msi_claw_quirks = {
3540735499
+ .delay_display_off = 500,
3540835500
+ .delay_sleep_entry = 500,
3540935501
+ .delay_sleep_exit = 200,

kernel.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Summary: The Linux kernel
170170
# This is needed to do merge window version magic
171171
%define patchlevel 11
172172
# This allows pkg_release to have configurable %%{?dist} tag
173-
%define specrelease 302%{?buildid}%{?dist}
173+
%define specrelease 303%{?buildid}%{?dist}
174174
# This defines the kabi tarball version
175175
%define kabiversion 6.11.8
176176

0 commit comments

Comments
 (0)