[Pkg-bitcoin-commits] [cgminer] 05/05: libusb_init_warning.patch: Log a warning and don't quit if libusb_init() fails (Closes: #757381).
Scott Sheridan Howard
showard at moszumanska.debian.org
Sun Oct 26 14:35:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
showard pushed a commit to branch master
in repository cgminer.
commit d77fc7fa1431e886be3003a1e4fa07b589ae6604
Author: Scott Howard <showard314 at gmail.com>
Date: Sun Oct 26 10:35:12 2014 -0400
libusb_init_warning.patch: Log a warning and don't quit if libusb_init() fails (Closes: #757381).
---
debian/changelog | 2 ++
debian/patches/kfreebsd_usb.patch | 10 +++++-----
debian/patches/libusb_init_warning.patch | 19 +++++++++++++++++++
debian/patches/series | 1 +
debian/patches/system_jansson.patch | 16 ++++++++--------
debian/rules | 1 +
6 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a25ab26..c1cf1cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
cgminer (4.7.0-1) unstable; urgency=medium
* New upstream release.
+ * libusb_init_warning.patch: Log a warning and don't quit if
+ libusb_init() fails (Closes: #757381).
-- Scott Howard <showard at debian.org> Sun, 26 Oct 2014 10:04:39 -0400
diff --git a/debian/patches/kfreebsd_usb.patch b/debian/patches/kfreebsd_usb.patch
index 9891eb2..45754f3 100644
--- a/debian/patches/kfreebsd_usb.patch
+++ b/debian/patches/kfreebsd_usb.patch
@@ -8,9 +8,9 @@ Description: FreeBSD's libusb-1.0 compatible library has a few differences
Author: Scott Howard <showard at debian.org>
Index: cgminer/cgminer.c
===================================================================
---- cgminer.orig/cgminer.c 2014-07-30 22:48:13.308811313 -0400
-+++ cgminer/cgminer.c 2014-07-30 22:48:13.304811313 -0400
-@@ -105,6 +105,12 @@
+--- cgminer.orig/cgminer.c 2014-10-26 10:13:45.426409188 -0400
++++ cgminer/cgminer.c 2014-10-26 10:13:45.422409188 -0400
+@@ -108,6 +108,12 @@
# define USE_FPGA
#endif
@@ -25,8 +25,8 @@ Index: cgminer/cgminer.c
{ "Round Robin" },
Index: cgminer/usbutils.c
===================================================================
---- cgminer.orig/usbutils.c 2014-07-30 22:34:23.508781843 -0400
-+++ cgminer/usbutils.c 2014-07-30 22:51:21.284817989 -0400
+--- cgminer.orig/usbutils.c 2014-10-26 10:13:45.426409188 -0400
++++ cgminer/usbutils.c 2014-10-26 10:13:45.422409188 -0400
@@ -18,6 +18,10 @@
#include "miner.h"
#include "usbutils.h"
diff --git a/debian/patches/libusb_init_warning.patch b/debian/patches/libusb_init_warning.patch
new file mode 100644
index 0000000..9372a90
--- /dev/null
+++ b/debian/patches/libusb_init_warning.patch
@@ -0,0 +1,19 @@
+Description: Log a warning rather than exit if libusb_init() fails, this way
+ buildds can generate architecture specific manpages
+Author: Scott Howard <showard at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757381
+Origin: https://gitorious.org/bitcoin/bfgminer/commit/1a4cfde10e914437a7eed49dd4a215c31db58b62
+
+Index: cgminer/cgminer.c
+===================================================================
+--- cgminer.orig/cgminer.c 2014-10-26 10:13:45.422409188 -0400
++++ cgminer/cgminer.c 2014-10-26 10:17:22.042414336 -0400
+@@ -9321,7 +9321,7 @@
+ if (err) {
+ fprintf(stderr, "libusb_init() failed err %d", err);
+ fflush(stderr);
+- quit(1, "libusb_init() failed");
++ applog(LOG_WARNING, "libusb_init() failed err %d", err);
+ }
+ initialise_usblocks();
+ usb_polling = true;
diff --git a/debian/patches/series b/debian/patches/series
index 9a9d9b6..122196f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
system_jansson.patch
kfreebsd_usb.patch
+libusb_init_warning.patch
diff --git a/debian/patches/system_jansson.patch b/debian/patches/system_jansson.patch
index 5ff420f..18b4594 100644
--- a/debian/patches/system_jansson.patch
+++ b/debian/patches/system_jansson.patch
@@ -3,9 +3,9 @@ Author: Scott Howard <showard at debian.org>
Index: cgminer/configure.ac
===================================================================
---- cgminer.orig/configure.ac 2014-07-30 22:53:37.816822838 -0400
-+++ cgminer/configure.ac 2014-07-30 22:53:37.808822837 -0400
-@@ -402,8 +402,6 @@
+--- cgminer.orig/configure.ac 2014-10-26 10:13:38.638409027 -0400
++++ cgminer/configure.ac 2014-10-26 10:13:38.634409027 -0400
+@@ -448,8 +448,6 @@
;;
esac
else
@@ -14,7 +14,7 @@ Index: cgminer/configure.ac
if test "x$have_linux" = "xtrue"; then
LIBUSB_LIBS+=" -ludev"
fi
-@@ -419,7 +417,7 @@
+@@ -465,7 +463,7 @@
AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
AC_CONFIG_SUBDIRS([compat/jansson-2.6])
@@ -25,8 +25,8 @@ Index: cgminer/configure.ac
Index: cgminer/Makefile.am
===================================================================
---- cgminer.orig/Makefile.am 2014-07-30 22:53:37.816822838 -0400
-+++ cgminer/Makefile.am 2014-07-30 22:53:37.808822837 -0400
+--- cgminer.orig/Makefile.am 2014-10-26 10:13:38.638409027 -0400
++++ cgminer/Makefile.am 2014-10-26 10:13:38.634409027 -0400
@@ -1,10 +1,10 @@
ACLOCAL_AMFLAGS = -I m4
@@ -51,8 +51,8 @@ Index: cgminer/Makefile.am
Index: cgminer/compat/Makefile.am
===================================================================
---- cgminer.orig/compat/Makefile.am 2014-07-30 22:53:33.380822680 -0400
-+++ cgminer/compat/Makefile.am 2014-07-30 22:53:52.612823363 -0400
+--- cgminer.orig/compat/Makefile.am 2014-10-26 10:13:38.638409027 -0400
++++ cgminer/compat/Makefile.am 2014-10-26 10:13:38.634409027 -0400
@@ -3,6 +3,5 @@
if WANT_USBUTILS
diff --git a/debian/rules b/debian/rules
index aaddb7a..450f4ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ DRIVERS= --enable-avalon \
--enable-bflsc \
--enable-bitforce \
--enable-bitfury \
+ --enable-blockerupter \
--enable-cointerra \
--enable-drillbit \
--enable-hashfast \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/cgminer.git
More information about the Pkg-bitcoin-commits
mailing list