aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorClive Wright2023-07-23 22:19:36 +0100
committerClive Wright2023-07-23 22:19:36 +0100
commitfbc6d527bea07b26a80f06647f355f101afbf1db (patch)
tree1474e97c28d45d6ec6854111b25e27994c099f50
parent26f358a58e65207bbfb553dcc9f56b8980f6be79 (diff)
downloadaur-fbc6d527bea07b26a80f06647f355f101afbf1db.tar.gz
Patched restore_drv script to remove extramodules directory if empty.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--extramodules.patch20
3 files changed, 17 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4fbfb3c79003..a981026d0b91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -30,7 +30,7 @@ pkgbase = oss-git
sha512sums = 6cefeca6921916d2fbf7c4efd354d3c0b7f7285c6d049912bd318f0b520698a2de2a974604a56a7b288636939773ef49f022962bb88f9e3b5ea442462a50de1b
sha512sums = 5db4bb6d636983485bc56aa7dd83347de848624d4ff160c1ec77d7d21d22154be61cad393af2d772f58bca47494d853dd5b286e4820440bd339cbb6edd50d1db
sha512sums = 0ca7b5ce6e63aadcfef763d105fa141260c2db002dd587200ada6d1c8c0abd4fdc2ca728b76d638181504faf58df3edbacb39cda2a988e1dd13facd962792c9e
- sha512sums = 1537b87e8d0c3b222f980da9d69190dd67d09ba906c810e59c01b486ae83bd378ad9c542908b08540b13bf5a151ed2632e8c590d867e7fef8d1c0c30057e3a9b
+ sha512sums = 0742a9400d6b683e3813cf1b1a1fb7f07dff22b6d26d47ca4e3d6179bc099044661c33e2d445a3fef278187d8dab90aae3323b4693e63383e03b9b5213bbc4a5
pkgname = oss-git
pkgdesc = Open Sound System UNIX audio architecture
diff --git a/PKGBUILD b/PKGBUILD
index b3a9be8cbdf2..8223cc8e0005 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,7 +41,7 @@ sha512sums=('SKIP'
'6cefeca6921916d2fbf7c4efd354d3c0b7f7285c6d049912bd318f0b520698a2de2a974604a56a7b288636939773ef49f022962bb88f9e3b5ea442462a50de1b'
'5db4bb6d636983485bc56aa7dd83347de848624d4ff160c1ec77d7d21d22154be61cad393af2d772f58bca47494d853dd5b286e4820440bd339cbb6edd50d1db'
'0ca7b5ce6e63aadcfef763d105fa141260c2db002dd587200ada6d1c8c0abd4fdc2ca728b76d638181504faf58df3edbacb39cda2a988e1dd13facd962792c9e'
- '1537b87e8d0c3b222f980da9d69190dd67d09ba906c810e59c01b486ae83bd378ad9c542908b08540b13bf5a151ed2632e8c590d867e7fef8d1c0c30057e3a9b')
+ '0742a9400d6b683e3813cf1b1a1fb7f07dff22b6d26d47ca4e3d6179bc099044661c33e2d445a3fef278187d8dab90aae3323b4693e63383e03b9b5213bbc4a5')
pkgver() {
diff --git a/extramodules.patch b/extramodules.patch
index 36ca3d3f71f2..b21d67d816fc 100644
--- a/extramodules.patch
+++ b/extramodules.patch
@@ -1,8 +1,7 @@
-diff --git a/setup/Linux/oss/build/install.sh b/setup/Linux/oss/build/install.sh
-index d47637c..7304451 100644
---- a/setup/Linux/oss/build/install.sh
-+++ b/setup/Linux/oss/build/install.sh
-@@ -198,7 +198,8 @@ fi
+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
@@ -12,3 +11,14 @@ index d47637c..7304451 100644
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