summarylogtreecommitdiffstats
path: root/extramodules.patch
diff options
context:
space:
mode:
authorAlex Wiggins2023-08-28 15:35:06 +0100
committerAlex Wiggins2023-08-28 15:35:06 +0100
commitcd9aabc5746dc700e54c2c25a579905d8f1a8861 (patch)
tree1d629ec7fcd9d48ab6e8f8081c272dcee584cdb2 /extramodules.patch
parent274e0997d6338aaf6831833da41ce072501f7d3c (diff)
downloadaur-cd9aabc5746dc700e54c2c25a579905d8f1a8861.tar.gz
Add patches for osscore and extramodules directory removal for kernel 6.4
Diffstat (limited to 'extramodules.patch')
-rw-r--r--extramodules.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/extramodules.patch b/extramodules.patch
new file mode 100644
index 000000000000..b21d67d816fc
--- /dev/null
+++ b/extramodules.patch
@@ -0,0 +1,24 @@
+diff -ur a/setup/Linux/oss/build/install.sh b/setup/Linux/oss/build/install.sh
+--- a/setup/Linux/oss/build/install.sh 2023-07-12 14:59:51.253990790 +0000
++++ b/setup/Linux/oss/build/install.sh 2023-07-12 14:56:33.394164100 +0000
+@@ -198,7 +198,8 @@
+
+ if ! test -d /lib/modules/$UNAME/kernel/oss
+ then
+- mkdir /lib/modules/$UNAME/kernel/oss
++ # --parents option required if extramodules does not exist.
++ mkdir --parents /lib/modules/$UNAME/kernel/oss
+ fi
+
+ if ! test -d /lib/modules/$UNAME/kernel/oss
+diff -ur a/setup/Linux/oss/scripts/restore_drv.sh b/setup/Linux/oss/scripts/restore_drv.sh
+--- a/setup/Linux/oss/scripts/restore_drv.sh 2023-07-12 14:47:07.254120802 +0000
++++ b/setup/Linux/oss/scripts/restore_drv.sh 2023-07-12 18:05:30.938684489 +0000
+@@ -9,6 +9,7 @@
+ /usr/sbin/soundoff
+
+ rm -rf /lib/modules/`uname -r`/kernel/oss
++[ $(ls -A /lib/modules/`uname -r`/extramodules) ] || rmdir /lib/modules/`uname -r`/extramodules
+
+ if test -x /sbin/chkconfig
+ then /sbin/chkconfig oss off > /dev/null 2>&1