[Pkg-bitcoin-commits] [cgminer] 04/04: build for new release
Scott Sheridan Howard
showard at moszumanska.debian.org
Thu Jun 25 15:35:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
showard pushed a commit to branch master
in repository cgminer.
commit 2324724bc18a23cb26ed719bef7908e1ffaeab7a
Author: Scott Howard <showard314 at gmail.com>
Date: Thu Jun 25 11:34:41 2015 -0400
build for new release
---
debian/cgminer.1 | 68 +++++++++++++++++++++++--------------
debian/changelog | 3 ++
debian/control | 2 +-
debian/patches/series | 1 -
debian/patches/system_jansson.patch | 62 ---------------------------------
debian/rules | 25 +++++++-------
6 files changed, 60 insertions(+), 101 deletions(-)
diff --git a/debian/cgminer.1 b/debian/cgminer.1
index bff13cd..4937555 100644
--- a/debian/cgminer.1
+++ b/debian/cgminer.1
@@ -1,13 +1,13 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1.
-.TH CGMINER "1" "November 2014" "cgminer 4.7.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.5.
+.TH CGMINER "1" "June 2015" "cgminer 4.9.2" "User Commands"
.SH NAME
cgminer \- multi-threaded multi-pool GPU, FPGA and CPU bitcoin miner.
.SH SYNOPSIS
.B cgminer
-[\fI-DElmpPQqUSsTouOchnV\fR]
+[\fI\,-DlmpPqUTouOchnV\/\fR]
.SH DESCRIPTION
multi-threaded multi-pool GPU, FPGA and CPU bitcoin miner.
-Built with avalon avalon2 bflsc bitfury cointerra drillbit hashfast icarus klondike mining support.
+Built with avalon avalon2 avalon4 bflsc bitfury cointerra drillbit hashfast icarus klondike mining support.
.PP
.SH OPTIONS
@@ -16,7 +16,7 @@ Built with avalon avalon2 bflsc bitfury cointerra drillbit hashfast icarus klond
Options for both config file and command line:
.TP
\fB\-\-anu\-freq\fR <arg>
-Set AntminerU1 frequency in MHz, range 125\-500 (default: 200.0)
+Set AntminerU1/2 frequency in MHz, range 125\-500 (default: 250.0)
.TP
\fB\-\-api\-allow\fR <arg>
Allow API access only to the given list of [G:]IP[/Prefix] addresses[/subnets]
@@ -54,6 +54,12 @@ Port number of miner API (default: 4028)
\fB\-\-api\-host\fR <arg>
Specify API listen address, default: 0.0.0.0
.TP
+\fB\-\-au3\-freq\fR <arg>
+Set AntminerU3 frequency in MHz, range 100\-250 (default: 225.0)
+.TP
+\fB\-\-au3\-volt\fR <arg>
+Set AntminerU3 voltage in mv, range 725\-850, 0 to not set (default: 775)
+.TP
\fB\-\-avalon\-auto\fR
Adjust avalon overclock frequency dynamically for best hashrate
.TP
@@ -90,6 +96,36 @@ Set Avalon2 fan to fixed speed
\fB\-\-avalon2\-polling\-delay\fR <arg>
Set Avalon2 polling delay value (ms) (default: 20)
.TP
+\fB\-\-avalon4\-automatic\-voltage\fR
+Automatic adjust voltage base on module DH
+.TP
+\fB\-\-avalon4\-voltage\fR
+Set Avalon4 core voltage, in millivolts, step: 125
+.TP
+\fB\-\-avalon4\-freq\fR
+Set frequency for Avalon4, 1 to 3 values, example: 445:385:370
+.TP
+\fB\-\-avalon4\-fan\fR
+Set Avalon4 target fan speed range
+.TP
+\fB\-\-avalon4\-temp\fR <arg>
+Set Avalon4 target temperature (default: 42)
+.TP
+\fB\-\-avalon4\-cutoff\fR <arg>
+Set Avalon4 overheat cut off temperature (default: 65)
+.TP
+\fB\-\-avalon4\-polling\-delay\fR <arg>
+Set Avalon4 polling delay value (ms) (default: 20)
+.TP
+\fB\-\-avalon4\-ntime\-offset\fR <arg>
+Set Avalon4 MM ntime rolling max offset (default: 4)
+.TP
+\fB\-\-avalon4\-aucspeed\fR <arg>
+Set Avalon4 AUC IIC bus speed (default: 400000)
+.TP
+\fB\-\-avalon4\-aucxdelay\fR <arg>
+Set Avalon4 AUC IIC xfer read delay, 4800 ~= 1ms (default: 19200)
+.TP
\fB\-\-balance\fR
Change multipool strategy from failover to even share balance
.TP
@@ -126,9 +162,6 @@ Set target temperature for BXF/HXF devices (default: 82)
\fB\-\-bxm\-bits\fR <arg>
Set BXM bits for overclocking (default: 54)
.TP
-\fB\-\-bet\-clk\fR <arg>
-Set Block Erupter clock (default: 0)
-.TP
\fB\-\-btc\-address\fR <arg>
Set bitcoin target address when solo mining to bitcoind (mandatory)
.TP
@@ -156,14 +189,8 @@ Set drillbit options <int|ext>:clock[:clock_divider][:voltage]
\fB\-\-drillbit\-auto\fR <arg>
Enable drillbit automatic tuning <every>:[<gooderr>:<baderr>:<maxerr>]
.TP
-\fB\-\-expiry\fR|\-E <arg>
-Upper bound on how many seconds after getting work we consider a share from it stale (default: 120)
-.TP
-\fB\-\-failover\-only\fR
-Don't leak work to backup pools when primary pool is lagging
-.TP
\fB\-\-fix\-protocol\fR
-Do not redirect to a different getwork protocol (eg. stratum)
+Do not redirect to stratum protocol from GBT
.TP
\fB\-\-hfa\-hash\-clock\fR <arg>
Set hashfast clock speed (default: 550)
@@ -190,7 +217,7 @@ Set the hashfast overheat throttling temperature (default: 95)
Set the hashfast target temperature (0 to disable) (default: 88)
.TP
\fB\-\-hro\-freq\fR
-Set the hashratio clock frequency (default: 280)
+Set the hashratio clock frequency
.TP
\fB\-\-hotplug\fR <arg>
Seconds between hotplug checks (0 means never check)
@@ -231,9 +258,6 @@ Force verbose mode and output per\-device statistics
\fB\-\-protocol\-dump\fR|\-P
Verbose dump of protocol\-level activities
.TP
-\fB\-\-queue\fR|\-Q <arg>
-Maximum number of work items to have queued (default: 1)
-.TP
\fB\-\-quiet\fR|\-q
Disable logging output, display status and errors
.TP
@@ -252,12 +276,6 @@ Change multipool strategy from failover to regularly rotate at N minutes
\fB\-\-round\-robin\fR
Change multipool strategy from failover to round robin on failure
.TP
-\fB\-\-scan\-serial\fR|\-S
-Serial port to probe for Serial FPGA Mining device
-.TP
-\fB\-\-scan\-time\fR|\-s <arg>
-Upper bound on time spent scanning current work, in seconds (default: \fB\-1\fR)
-.TP
\fB\-\-sched\-start\fR
Set a time of day in HH:MM to start mining (a once off without a stop time)
.TP
diff --git a/debian/changelog b/debian/changelog
index d59dab9..958cb76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
cgminer (4.9.2-1) unstable; urgency=medium
* New release
+ - Updated list of supported devices
+ - Updated manpage
+ * Removed debian patch to use system json, included upstream
-- Scott Howard <showard at debian.org> Thu, 25 Jun 2015 11:01:42 -0400
diff --git a/debian/control b/debian/control
index 46393b0..859d9c8 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 9), dh-autoreconf
,libjansson-dev
,libudev-dev [!kfreebsd-any]
,pkg-config
- ,help2man
,zlib1g-dev
+ ,libsystemd-dev
Standards-Version: 3.9.6
Homepage: https://github.com/ckolivas/cgminer
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-bitcoin/cgminer.git
diff --git a/debian/patches/series b/debian/patches/series
index 122196f..e897997 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-system_jansson.patch
kfreebsd_usb.patch
libusb_init_warning.patch
diff --git a/debian/patches/system_jansson.patch b/debian/patches/system_jansson.patch
deleted file mode 100644
index 18b4594..0000000
--- a/debian/patches/system_jansson.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: Use system jansson
-Author: Scott Howard <showard at debian.org>
-
-Index: cgminer/configure.ac
-===================================================================
---- 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
-- AC_CONFIG_SUBDIRS([compat/libusb-1.0])
-- LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"
- if test "x$have_linux" = "xtrue"; then
- LIBUSB_LIBS+=" -ludev"
- fi
-@@ -465,7 +463,7 @@
- AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
-
- AC_CONFIG_SUBDIRS([compat/jansson-2.6])
--JANSSON_LIBS="compat/jansson-2.6/src/.libs/libjansson.a"
-+JANSSON_LIBS="-ljansson"
-
- PKG_PROG_PKG_CONFIG()
-
-Index: cgminer/Makefile.am
-===================================================================
---- 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
-
--JANSSON_CPPFLAGS= -I$(top_builddir)/compat/jansson-2.6/src -I$(top_srcdir)/compat/jansson-2.6/src
-+JANSSON_CPPFLAGS=
-
- if WANT_USBUTILS
--USBUTILS_CPPFLAGS = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb
-+USBUTILS_CPPFLAGS = -I/usr/include/libusb-1.0
- else
- USBUTILS_CPPFLAGS =
- endif
-@@ -16,7 +16,7 @@
- bitforce-firmware-flash.c hexdump.c ASIC-README \
- 01-cgminer.rules
-
--SUBDIRS = lib compat ccan
-+SUBDIRS = lib ccan
-
- cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CPPFLAGS) $(USBUTILS_CPPFLAGS)
-
-Index: cgminer/compat/Makefile.am
-===================================================================
---- 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
- if WANT_STATIC_LIBUSB
--SUBDIRS += libusb-1.0
- endif
- endif
diff --git a/debian/rules b/debian/rules
index b7d2b2b..73aed1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,23 +5,24 @@
#export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
-DRIVERS= --enable-avalon \
- --enable-avalon2 \
- --enable-bflsc \
- --enable-bitfury \
- --enable-blockerupter \
- --enable-cointerra \
- --enable-drillbit \
- --enable-hashfast \
- --enable-hashratio \
- --enable-icarus \
- --enable-klondike
+#Below list is taken from README
+DRIVERS= --enable-avalon\
+ --enable-avalon2\
+ --enable-avalon4\
+ --enable-bflsc\
+ --enable-bitfury\
+ --enable-cointerra\
+ --enable-drillbit\
+ --enable-hashfast\
+ --enable-hashratio\
+ --enable-icarus\
+ --enable-klondike
%:
dh $@ --with autoreconf
override_dh_auto_configure:
- dh_auto_configure -- --bindir=/usr/lib/cgminer $(DRIVERS) --with-system-libusb --disable-silent-rules
+ dh_auto_configure -- --bindir=/usr/lib/cgminer $(DRIVERS) --with-system-libusb --disable-silent-rules --enable-libsystemd --with-system-jansson
override_dh_auto_build:
dh_auto_build
--
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