From c301894aa3683ee4c8c33e9b8145ca1e3e91ebba Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 22 May 2014 10:37:43 +0200
Subject: [PATCH 1/5] fsstress added

---
 scripts/fsstress.build | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100755 scripts/fsstress.build

diff --git a/scripts/fsstress.build b/scripts/fsstress.build
new file mode 100755
index 0000000..c4445a5
--- /dev/null
+++ b/scripts/fsstress.build
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+source "$(dirname $0)/../lib/libem.bash"
+
+function em.configure() {
+	:
+}
+
+function em.build() {
+        cd "${EM_SRCDIR}"
+
+	make -j ${JOBS}
+}
+
+function em.install() {
+        cd "${EM_SRCDIR}"
+	mkdir -p ${PREFIX}/bin
+	install -m 0755 fsstress "${PREFIX}/bin"
+}
+
+#function em.install_doc() {
+#	install -m 0444 \
+#		Copyright \
+#		ChangeLog \
+#		NEWS \
+#		README \
+#		README.1ST \
+#		"${DOCDIR}"
+#}
+
+#em.supported_os 'Linux'
+em.add_to_family 'System'
+em.set_build_dependencies "${COMPILER}"
+em.make_all

From 8beba670cf9c4c57c88882462bcac22b45ca0c15 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 22 May 2014 10:38:52 +0200
Subject: [PATCH 2/5] fsstress added

---
 config/versions.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/versions.conf b/config/versions.conf
index a220e3c..e66a316 100644
--- a/config/versions.conf
+++ b/config/versions.conf
@@ -7,6 +7,7 @@ giflib		5.0.6
 gmp		5.1.1
 gnuplot		4.6.3
 gsl		1.15
+fsstress	1.0.0
 h5hut_serial	1.99.13
 H5hut		1.99.13
 H5root		1.2.0

From 4b22b6a8582e1d9e0e740176566c10d619ffa511 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 22 May 2014 10:41:09 +0200
Subject: [PATCH 3/5] links to default family configurations removed

---
 config/families.d/Compiler.conf    | 1 -
 config/families.d/HDF5.conf        | 1 -
 config/families.d/HDF5_serial.conf | 1 -
 config/families.d/MPI.conf         | 1 -
 4 files changed, 4 deletions(-)
 delete mode 120000 config/families.d/Compiler.conf
 delete mode 120000 config/families.d/HDF5.conf
 delete mode 120000 config/families.d/HDF5_serial.conf
 delete mode 120000 config/families.d/MPI.conf

diff --git a/config/families.d/Compiler.conf b/config/families.d/Compiler.conf
deleted file mode 120000
index 4d33b43..0000000
--- a/config/families.d/Compiler.conf
+++ /dev/null
@@ -1 +0,0 @@
-gcc-4.7.3
\ No newline at end of file
diff --git a/config/families.d/HDF5.conf b/config/families.d/HDF5.conf
deleted file mode 120000
index b568be6..0000000
--- a/config/families.d/HDF5.conf
+++ /dev/null
@@ -1 +0,0 @@
-hdf5-1.8.12
\ No newline at end of file
diff --git a/config/families.d/HDF5_serial.conf b/config/families.d/HDF5_serial.conf
deleted file mode 120000
index e4f6ceb..0000000
--- a/config/families.d/HDF5_serial.conf
+++ /dev/null
@@ -1 +0,0 @@
-hdf5_serial-1.8.12
\ No newline at end of file
diff --git a/config/families.d/MPI.conf b/config/families.d/MPI.conf
deleted file mode 120000
index c840704..0000000
--- a/config/families.d/MPI.conf
+++ /dev/null
@@ -1 +0,0 @@
-openmpi-1.6.5
\ No newline at end of file

From 9929eac6cc365e7c0fb1336249391610a68fefa7 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 22 May 2014 10:42:38 +0200
Subject: [PATCH 4/5] ignore file added to config/families.d

---
 config/families.d/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 config/families.d/.gitignore

diff --git a/config/families.d/.gitignore b/config/families.d/.gitignore
new file mode 100644
index 0000000..fee9217
--- /dev/null
+++ b/config/families.d/.gitignore
@@ -0,0 +1 @@
+*.conf

From 0fa13e175dadbc7a18a12eff5a63072a308f8079 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 22 May 2014 13:08:19 +0200
Subject: [PATCH 5/5] lib/libem.bash: set link according new directory
 structure

---
 lib/libem.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/libem.bash b/lib/libem.bash
index 883ed50..fe2ed5d 100644
--- a/lib/libem.bash
+++ b/lib/libem.bash
@@ -375,8 +375,8 @@ function _set_link() {
 
 	local x
 	IFS='/' x=(${_path})
-	local -r _target="../"$(eval printf "../%.s" {1..${#x[@]}})${EM_ETCDIR##*/}/"${EM_FAMILY}/${P}"
-	ln -fs "${_target}" "${EM_MODULENAME##*/}"
+	local -r _target="../"$(eval printf "../%.s" {1..${#x[@]}})${EM_ETCDIR##*/}/"${EM_FAMILY}/${P}/modulefile"
+	ln -fhs "${_target}" "${EM_MODULENAME##*/}"
 	)
 }