From 69552ea0875be62e4b323ef13685b536c69ee1d8 Mon Sep 17 00:00:00 2001 From: Holger Schinzel Date: Tue, 23 Jun 2015 22:10:56 +0200 Subject: [PATCH 1/2] added gitian builds for Raspberry Pi --- contrib/gitian-descriptors/gitian-rpi2.yml | 112 +++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 contrib/gitian-descriptors/gitian-rpi2.yml diff --git a/contrib/gitian-descriptors/gitian-rpi2.yml b/contrib/gitian-descriptors/gitian-rpi2.yml new file mode 100644 index 000000000..6bf051f8c --- /dev/null +++ b/contrib/gitian-descriptors/gitian-rpi2.yml @@ -0,0 +1,112 @@ +--- +name: "dash-raspberry-0.12" +enable_cache: true +suites: +- "precise" +architectures: +- "amd64" +packages: +- "g++-multilib" +- "git-core" +- "pkg-config" +- "autoconf2.13" +- "libtool" +- "automake" +- "faketime" +- "bsdmainutils" +- "binutils-gold" +reference_datetime: "2014-01-10 00:00:00" +remotes: +- "url": "https://github.com/dashpay/dash.git" + "dir": "dash" +files: +- "raspberrypi-tools.tar.gz" +script: | + WRAP_DIR=$HOME/wrapped + HOSTS="arm-linux-gnueabihf" + CONFIGFLAGS="--enable-upnp-default --enable-glibc-back-compat" + FAKETIME_HOST_PROGS="" + FAKETIME_PROGS="date ar ranlib nm strip" + + tar --warning=no-timestamp -xzf raspberrypi-tools.tar.gz + export TOOLCHAIN_BIN=$(pwd)/raspberrypi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin + export PATH=$PATH:$TOOLCHAIN_BIN + + export QT_RCC_TEST=1 + export GZIP="-9n" + export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME"" + export TZ="UTC" + export BUILD_DIR=`pwd` + mkdir -p ${WRAP_DIR} + if test -n "$GBUILD_CACHE_ENABLED"; then + export SOURCES_PATH=${GBUILD_COMMON_CACHE} + export BASE_CACHE=${GBUILD_PACKAGE_CACHE} + mkdir -p ${BASE_CACHE} ${SOURCES_PATH} + fi + + # Create global faketime wrappers + for prog in ${FAKETIME_PROGS}; do + echo '#!/bin/bash' > ${WRAP_DIR}/${prog} + echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog} + echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog} + echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${prog} + echo "\$REAL \$@" >> $WRAP_DIR/${prog} + chmod +x ${WRAP_DIR}/${prog} + done + + # Create per-host faketime wrappers + for i in $HOSTS; do + for prog in ${FAKETIME_HOST_PROGS}; do + echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog} + echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog} + echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog} + echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${i}-${prog} + echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog} + chmod +x ${WRAP_DIR}/${i}-${prog} + done + done + export PATH=${WRAP_DIR}:${PATH} + + cd dash + BASEPREFIX=`pwd`/depends + # Build dependencies for each host + for i in $HOSTS; do + make ${MAKEOPTS} NO_QT=1 -C ${BASEPREFIX} HOST="${i}" + done + + # Create the release tarball using (arbitrarily) the first host + ./autogen.sh + ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` + make NO_QT=1 dist + SOURCEDIST=`echo dash-*.tar.gz` + DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` + # Correct tar file order + mkdir -p temp + pushd temp + tar xf ../$SOURCEDIST + find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + popd + + ORIGPATH="$PATH" + # Extract the release tarball into a dir for each host and build + for i in ${HOSTS}; do + export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH} + mkdir -p distsrc-${i} + cd distsrc-${i} + INSTALLPATH=`pwd`/installed/${DISTNAME} + mkdir -p ${INSTALLPATH} + tar --strip-components=1 -xf ../$SOURCEDIST + + ./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} + make ${MAKEOPTS} NO_QT=1 + make NO_QT=1 install-strip + cd installed + find . -name "lib*.la" -delete + find . -name "lib*.a" -delete + rm -rf ${DISTNAME}/lib/pkgconfig + find ${DISTNAME} | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz + cd ../../ + done + mkdir -p $OUTDIR/src + mv $SOURCEDIST $OUTDIR/src + mv ${OUTDIR}/${DISTNAME}-arm-*.tar.gz ${OUTDIR}/${DISTNAME}-RPi2.tar.gz From 08a680316584151b2dac3f94d562f181d0225e94 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Tue, 23 Jun 2015 23:44:20 +0300 Subject: [PATCH 2/2] fixing all kind of typos etc --- src/darksend.cpp | 6 ++++-- src/init.cpp | 2 +- src/masternode-payments.cpp | 4 ++-- src/rpcmasternode.cpp | 2 +- src/wallet.cpp | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/darksend.cpp b/src/darksend.cpp index 894fe5eb6..fa7cb537d 100644 --- a/src/darksend.cpp +++ b/src/darksend.cpp @@ -607,7 +607,7 @@ void CDarksendPool::CheckFinalTransaction() if(fDebug) LogPrintf("Transaction 2: %s\n", txNew.ToString().c_str()); // See if the transaction is valid - if (!txNew.AcceptToMemoryPool(false, true, true)); + if (!txNew.AcceptToMemoryPool(false, true, true)) { LogPrintf("CDarksendPool::Check() - CommitTransaction : Error: Transaction not valid\n"); SetNull(); @@ -1758,8 +1758,10 @@ bool CDarksendPool::MakeCollateralAmounts() // use the same cachedLastSuccess as for DS mixinx to prevent race if(pwalletMain->CommitTransaction(wtx, reservekeyChange)) cachedLastSuccess = chainActive.Tip()->nHeight; + else + LogPrintf("MakeCollateralAmounts: CommitTransaction failed!\n"); - LogPrintf("MakeCollateralAmounts Success: tx %s\n", wtx.GetHash().GetHex().c_str()); + LogPrintf("MakeCollateralAmounts: tx %s\n", wtx.GetHash().GetHex()); return true; } diff --git a/src/init.cpp b/src/init.cpp index 3f1d15de3..99311f247 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -791,7 +791,7 @@ bool AppInit2(boost::thread_group& threadGroup) { CAmount nMaxFee = 0; if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee)) - return InitError(strprintf(_("Invalid amount for -maxtxfee=: '%s'"), mapArgs["-maptxfee"])); + return InitError(strprintf(_("Invalid amount for -maxtxfee=: '%s'"), mapArgs["-maxtxfee"])); if (nMaxFee > nHighTransactionMaxFeeWarning) InitWarning(_("Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.")); maxTxFee = nMaxFee; diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp index bffa3a36d..79c110a53 100644 --- a/src/masternode-payments.cpp +++ b/src/masternode-payments.cpp @@ -54,7 +54,7 @@ bool IsBlockPayeeValid(const CTransaction& txNew, int64_t nBlockHeight) if(IsSporkActive(SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT)){ return false; } else { - LogPrintf("Budget enforcement is disabled, accepting block"); + LogPrintf("Budget enforcement is disabled, accepting block\n"); return true; } } @@ -69,7 +69,7 @@ bool IsBlockPayeeValid(const CTransaction& txNew, int64_t nBlockHeight) if(IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)){ return false; } else { - LogPrintf("Masternode payment enforcement is disabled, accepting block"); + LogPrintf("Masternode payment enforcement is disabled, accepting block\n"); return true; } } diff --git a/src/rpcmasternode.cpp b/src/rpcmasternode.cpp index 37553f100..3ec6ccd2d 100644 --- a/src/rpcmasternode.cpp +++ b/src/rpcmasternode.cpp @@ -477,7 +477,7 @@ Value masternodelist(const Array& params, bool fHelp) " additional matches in some modes are also available\n" "\nAvailable modes:\n" " activeseconds - Print number of seconds masternode recognized by the network as enabled\n" - " full - Print info in format 'status protocol pubkey vin lastseen activeseconds'\n" + " full - Print info in format 'status protocol pubkey IP lastseen activeseconds lastpaid'\n" " (can be additionally filtered, partial match)\n" " lastseen - Print timestamp of when a masternode was last seen on the network\n" " pose - Print Proof-of-Service score\n" diff --git a/src/wallet.cpp b/src/wallet.cpp index 3ee169a3c..159e1984e 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1648,7 +1648,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int { setCoinsRet.insert(vValue[i].second); nValueRet += vValue[i].first; - s += FormatMoney(vValue[i].first); + s += FormatMoney(vValue[i].first) + " "; } } LogPrintf("%s - total %s\n", s, FormatMoney(nBest));