aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Arteaga <andyspiros@gmail.com>2011-07-14 01:08:09 +0200
committerAndrea Arteaga <andyspiros@gmail.com>2011-07-14 01:08:09 +0200
commit84cc5217f1226e84b4c856d0d2e96a98d29c7c02 (patch)
tree329892331f08ffdb1c5adf875c191649f61cdcf6
parentAutobench imported from proj/auto-numerical-bench (diff)
parentUpdate ocfs2 (diff)
downloadsci-84cc5217f1226e84b4c856d0d2e96a98d29c7c02.tar.gz
sci-84cc5217f1226e84b4c856d0d2e96a98d29c7c02.tar.bz2
sci-84cc5217f1226e84b4c856d0d2e96a98d29c7c02.zip
Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci
-rw-r--r--sys-fs/ocfs2-tools/Manifest20
-rw-r--r--sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild7
2 files changed, 22 insertions, 5 deletions
diff --git a/sys-fs/ocfs2-tools/Manifest b/sys-fs/ocfs2-tools/Manifest
index 69ed1b92e..1864bd873 100644
--- a/sys-fs/ocfs2-tools/Manifest
+++ b/sys-fs/ocfs2-tools/Manifest
@@ -1,14 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX ocfs2.init 4016 RMD160 3130241aee4014da821bf8b4b82a5004104697f4 SHA1 266895bb161daf3eca0d0f4b4fc3c9783a1bab8e SHA256 70be03610424926e4882a64f4530923f05ee882e7d9f6e242f8cde538665c275
DIST ocfs2-tools-1.6.4.tar.gz 823914 RMD160 c8b65f4c26017e257c4190322d6df64e9ef7925b SHA1 1409a13f63b55457a474c5f5662260e420452ee9 SHA256 dda9db208312e3e5f4f55ee77e66e7b35b9cc10421bc02065a6c168e42b24755
-EBUILD ocfs2-tools-1.6.4.ebuild 1309 RMD160 99efb72953f654785dab35d650668006efc09bf0 SHA1 41e6c9332ec53cda148cf994d5851f82f77639eb SHA256 4e8f8063e924ee77aaf0c9a07277d802a4f7728ee9e404ac0e4348bb29605ae2
+EBUILD ocfs2-tools-1.6.4.ebuild 1490 RMD160 290cd192619a1124e887ca2983f2e3fcfce92754 SHA1 eb281079756c9321b4aa1145579ab835acd87a03 SHA256 e720a1d7e052fbf41b8f9b73ffef100a031bb25df3abf72d84198eeb8afd735b
MISC metadata.xml 282 RMD160 44cf28de660ee14ba14807a7c794e8527c49f435 SHA1 de84d24c38b1b661fb21d35bdd08702d1b522dc8 SHA256 616826b107b0ccaef8100ce70985e1d4f7c3f4d77bab9b83924da538df1002c9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk4EudMACgkQgAnW8HDreRZ7pACfcrf4lN1NrX2yAEfN8yISWa5d
-6ccAnj5aOhRvip6GGHVdYrlK+gqn+EZ+
-=Osd5
+iQIcBAEBCAAGBQJOHhumAAoJEOf+E+/4L5LmJVgQAKF/+6YtWOJoywKv8SAnqOJ8
+q7OeVjXtIBXjkgZbs8OlbYktWLHEPZ67T0Q+SRE8z/YDt8g/sdEaX/ms2aWdpDqs
+QLXoxJLJk0ZV4Qug9gPCzo7KGP3J2Dq7ep9UtSgS6IdavZijsSQ2JKdtd48PjBcI
+7nCwwUDjeNhUK8a46uTrvIt+BSx9XAWtwUkwTIhyEPJbpbcC8ba31Wr6J0Wadn3b
+j16werixkQb8p0/YfV/pJlBOGH9ZctJRsiOZi/NX0MpaZlbwEjwwbDRkJTdkQ/H+
+Xg3TeYsConLgl6lRM9sWX4AFsA4v5VIOySNkcm63SrAsI7BxE0MkcDulQHD2UNT3
+Fb4k1PvqOJQfKw2DlZ9kJr+ICSF5WbM6HTI4X4iSmh1eJo5m73jL7mghweFMQyRF
+m10cqrVUmi24ezAV4wyjLU0SrD6IBgFYo987AsgZBDDsmD/F6awJb432JcG5CUdZ
+XnWjGVu6W7fVc0KmXiftoNOeGXVu2muASkKkw/5mTDR2U63fapUw6lPG/pFqaA8h
+kJhgpRQK3TLnvKPXj2k+zkp0GrFPZW/VjYpunF5bZncPU32HEUO8YdgARaDVscpt
+2C2K2g4xOyeKgJ2qQOQcMXE7hCxNuUPOQTxOSj8tUe3te1VH3OtYmtX3s4Rpuavu
+rokKqMJAh7XgEBd8gbb6
+=eZ2x
-----END PGP SIGNATURE-----
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
index f8431e2cd..bd2d15251 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -45,6 +45,13 @@ pkg_setup() {
python_pkg_setup
}
+src_prepare() {
+ # gentoo uses /sys/kernel/dlm as dlmfs mountpoint
+ sed -e 's:"/dlm/":"/sys/kernel/dlm":g' \
+ -i libo2dlm/o2dlm_test.c \
+ -i libocfs2/dlm.c || die "sed failed"
+}
+
src_configure() {
econf \
$(use_enable debug debug) \