3 files changed, 27 insertions, 23 deletions
diff --git a/shfs/shfs-modules_0.33.oe b/shfs/shfs-modules_0.33.oe
index e69de29bb2..f5bfe4160a 100644
--- a/shfs/shfs-modules_0.33.oe
+++ b/shfs/shfs-modules_0.33.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "A simple and easy to use Linux kernel (2.4+) module which allows you to mount remote filesystems using plain shell (ssh/rsh) connection. \
+It supports some nice features like number of different caches for access speedup, target system optimisations, etc."
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/shfs/shfs-${PV}.tar.gz"
+S = "${WORKDIR}/shfs-${PV}/shfs/Linux-2.4"
+
+#FIXME depend S on kernel version
+
+inherit module
+
+do_compile() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake KERNEL_SOURCES=${KERNEL_SOURCE} KERNEL=${KERNEL_VERSION} LINKER=${LD} LDFLAGS=-r
+}
+
+do_stage() {
+	install -m 0755 shfs_fs.h shfs.h ${STAGING_INCDIR}/
+}
+
+do_install() {
+        install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/fs/shfs/
+	install -m 0755 shfs.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/fs/shfs/shfs.o
+}
diff --git a/shfs/shfs-utils_0.32.oe b/shfs/shfs-utils_0.32.oe
deleted file mode 100644
index 42c8746f91..0000000000
--- a/shfs/shfs-utils_0.32.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "A simple and easy to use Linux kernel (2.4+) module which allows you to mount remote filesystems using plain shell (ssh/rsh) connection. \
-It supports some nice features like number of different caches for access speedup, target system optimisations, etc."
-SECTION = "base"
-PRIORITY = "optional"
-MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-RDEPENDS = "shfs-modules (${PV})"
-DEPENDS = "virtual/kernel"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/shfs/shfs-${PV}.tar.gz"
-S = "${WORKDIR}/shfs-${PV}/shfsmount"
-
-KERNEL_VERSION="`cat ${STAGING_LIBDIR}/../kernel/kernel-version`"
-CFLAGS_append=' -DVERSION=\\"${KERNEL_VERSION}\\"'
-
-do_compile() {
-        oe_runmake LINKER="${CC}"
-}
-
-do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 shfsmount shfsumount ${D}/${bindir}
-}
diff --git a/shfs/shfs-utils_0.33.oe b/shfs/shfs-utils_0.33.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/shfs/shfs-utils_0.33.oe