summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/cdfs-libre/PKGBUILD13
-rw-r--r--libre/cdfs-libre/cdfs-3.8.patch42
-rw-r--r--libre/cdfs-libre/cdfs.install6
3 files changed, 53 insertions, 8 deletions
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 12e461519..290eff882 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=cdfs
pkgname=cdfs-libre
pkgver=2.6.27
-pkgrel=36
+pkgrel=38
pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
arch=(i686 x86_64 mips64el)
url="http://www.elis.UGent.be/~ronsse/cdfs/"
@@ -19,27 +19,30 @@ install=cdfs.install
source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$_pkgname-$pkgver.tar.bz2"
"cdfs-3.0.patch"
"cdfs-3.2.patch"
- "cdfs-3.4.patch")
+ "cdfs-3.4.patch"
+ "cdfs-3.8.patch")
md5sums=('ac64c014a90e3c488394832ea29605b3'
'aba7da94a9dcbb8a93ea423cb6958fef'
'e934407b3460257a301822ffc4ab3933'
- '9215e7bdac728bd2f889fb525e543454')
+ '9215e7bdac728bd2f889fb525e543454'
+ 'b036fd72b033294605bec2b60a73e3bd')
_kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -`
_kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version`
build() {
- depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`")
-
cd $srcdir/$_pkgname-$pkgver
patch -p1 <$srcdir/cdfs-3.0.patch
patch -p1 <$srcdir/cdfs-3.2.patch
patch -p1 <$srcdir/cdfs-3.4.patch
+ patch -p1 <$srcdir/cdfs-3.8.patch
make KDIR=/usr/lib/modules/${_kernverfull}/build
sed -i "s|extramodules-.*-LIBRE|extramodules-3.${_kernver}-LIBRE|" $startdir/cdfs.install
}
package() {
+ depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`")
+
cd $srcdir/$_pkgname-$pkgver
install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko
}
diff --git a/libre/cdfs-libre/cdfs-3.8.patch b/libre/cdfs-libre/cdfs-3.8.patch
new file mode 100644
index 000000000..10d9c8b47
--- /dev/null
+++ b/libre/cdfs-libre/cdfs-3.8.patch
@@ -0,0 +1,42 @@
+diff -upr cdfs-2.6.27.orig/daemon.c cdfs-2.6.27/daemon.c
+--- cdfs-2.6.27.orig/daemon.c 2009-12-21 16:02:50.000000000 +0200
++++ cdfs-2.6.27/daemon.c 2013-02-21 06:14:45.000000000 +0200
+@@ -158,7 +158,6 @@ int kcdfsd_thread(void *unused){
+ exit_files(current); /* daemonize doesn't do exit_files */
+ daemonize();
+ #else
+- daemonize("k"FSNAME"d");
+
+ /* Allow SIGTERM to quit properly when removing module */
+ /* By default with daemonize all signals are dropped */
+diff -upr cdfs-2.6.27.orig/root.c cdfs-2.6.27/root.c
+--- cdfs-2.6.27.orig/root.c 2009-12-21 15:38:31.000000000 +0200
++++ cdfs-2.6.27/root.c 2013-02-21 06:15:20.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "cdfs.h"
+
+ #include <linux/module.h>
++#include <linux/kthread.h>
+
+
+ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*
+@@ -643,14 +644,15 @@ static int __init cdfs_init(void) {
+ cdfs_proc_cd=NULL;
+
+ // start kernel thread
+- if ((kcdfsd_pid = kernel_thread(kcdfsd_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND)) >0 ) {
+- return 0;
+- } else {
+- printk(FSNAME" kernel_thread failed.\n");
++ kcdfsd_pid = kthread_run(kcdfsd_thread, NULL, "kcdfsd_thread");
++ if (IS_ERR(kcdfsd_pid)) {
++ printk(FSNAME" kthread_run failed.\n");
+ if (cdfs_proc_entry) remove_proc_entry(FSNAME, NULL);
+ unregister_filesystem(&cdfs_fs_type);
+ return -1;
+ }
++
++ return 0;
+ }
+
+ /******************************************************************/
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
index 3847b8b14..1e587cf72 100644
--- a/libre/cdfs-libre/cdfs.install
+++ b/libre/cdfs-libre/cdfs.install
@@ -1,14 +1,14 @@
post_install() {
- EXTRAMODULES='extramodules-3.7-LIBRE'
+ EXTRAMODULES='extramodules-3.8-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.7-LIBRE'
+ EXTRAMODULES='extramodules-3.8-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_remove() {
- EXTRAMODULES='extramodules-3.7-LIBRE'
+ EXTRAMODULES='extramodules-3.8-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}