summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2015-06-29 15:33:25 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2015-06-29 15:33:25 +0200
commit1e28b92643610b9f19a15334b6b104beaa020b5d (patch)
treec4da4d2b93ede370e7df5d6e252ca49b8ca24745 /patches
parentcbb1356ec0d33fd9087173e35316878f3c9349d5 (diff)
downloadptxdist-1e28b92643610b9f19a15334b6b104beaa020b5d.tar.gz
ptxdist-1e28b92643610b9f19a15334b6b104beaa020b5d.tar.xz
owfs: version bump to 3.1p0 + swich on i2c
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/owfs-3.1p0/0001-Fix-build-issue-when-building-without-EXTENDED_RWLOC.patch20
-rw-r--r--patches/owfs-3.1p0/series4
2 files changed, 24 insertions, 0 deletions
diff --git a/patches/owfs-3.1p0/0001-Fix-build-issue-when-building-without-EXTENDED_RWLOC.patch b/patches/owfs-3.1p0/0001-Fix-build-issue-when-building-without-EXTENDED_RWLOC.patch
new file mode 100644
index 000000000..a59a54476
--- /dev/null
+++ b/patches/owfs-3.1p0/0001-Fix-build-issue-when-building-without-EXTENDED_RWLOC.patch
@@ -0,0 +1,20 @@
+From: =?UTF-8?q?Johan=20Str=C3=B6m?= <johan@stromnet.se>
+Date: Mon, 18 May 2015 20:03:19 +0200
+Subject: [PATCH] Fix build issue when building without EXTENDED_RWLOCK_DEBUG
+
+---
+ module/owlib/src/c/ow_rwlock.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/module/owlib/src/c/ow_rwlock.c b/module/owlib/src/c/ow_rwlock.c
+index 60c9dd05004d..4aa28930a994 100644
+--- a/module/owlib/src/c/ow_rwlock.c
++++ b/module/owlib/src/c/ow_rwlock.c
+@@ -25,7 +25,6 @@ void my_rwlock_init(my_rwlock_t * rwlock)
+ int semrc;
+ semrc = pthread_rwlock_init(rwlock, NULL);
+ if(semrc != 0) {
+- if (
+ LOCK_DEBUG("semrc=%d [%s] RWLOCK INIT", semrc, strerror(errno));
+ debug_crash();
+ }
diff --git a/patches/owfs-3.1p0/series b/patches/owfs-3.1p0/series
new file mode 100644
index 000000000..80d8d4b63
--- /dev/null
+++ b/patches/owfs-3.1p0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Fix-build-issue-when-building-without-EXTENDED_RWLOC.patch
+# a4ff5785148f23927ccc260a39d7d499 - git-ptx-patches magic