update

setup_amd.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
-script_version="1.46"
-rdate="16/12/2018"
+script_version="1.47"
+rdate="19/12/2018"
 remote_folder="http://wareck.free.fr/openrig"
 #### OPTIONS ####
 host_name="Miner1"
@@ -13,6 +13,7 @@ Drivers="18.40"
 ROCM_="NO" #rcom compute
 ETHMine="YES"
 XMRIG_AMD="YES"
+XMRIG_CPU="YES"
 XMR_STAK="YES"
 SGMINER="YES"
 SGMINER_TT="YES"
@@ -56,6 +57,7 @@ if [ $ROCM_ = "YES"  ]; then echo -e "\e[94m   AMD DRIVER + ROCm Compute firmwar
 if [ $ROCM_ = "NO"  ]; then echo -e "\e[94m    AMD GPU PRO Drivers $amd_driver_v\e[0m\e[97m";fi
 if [ $ETHMine = "YES" ]; then echo -e "\e[97m    +\e[91m Etherminer \e[0m\e[97m";fi
 if [ $XMRIG_AMD = "YES" ]; then echo -e "\e[97m    +\e[91m XMRig-amd \e[0m\e[97m";fi
+if [ $XMRIG_CPU = "YES" ]; then echo -e "\e[97m    +\e[91m XMRig-cpu \e[0m\e[97m";fi
 if [ $XMR_STAK = "YES" ]; then echo -e "\e[97m    +\e[91m XMR-Stak \e[0m\e[97m";fi
 if [ $SGMINER = "YES" ]; then echo -e "\e[97m    +\e[91m Sgminer-nicehash\e[0m\e[97m";fi
 if [ $SGMINER_TT = "YES" ]; then echo -e "\e[97m    +\e[91m Sgminer-timetravel\e[0m\e[97m";fi
@@ -77,17 +79,16 @@ echo -e "\n\e[95mSystem Update :\e[0m"
 sudo apt-get update
 sudo add-apt-repository -y ppa:ethereum/ethereum -y
 sudo apt-get update
-sudo apt install ethereum git screen htop curl ntp pv git cmake libcryptopp-dev libleveldb-dev libjsoncpp-dev \
-build-essential libcurl4-gnutls-dev libboost-all-dev libgmp-dev \
-libreadline-dev libmicrohttpd-dev libjansson-dev libgmp-dev libssl-dev unzip python-nfqueue python-scapy mesa-common-dev -y
-sudo apt-get install --install-recommends xserver-xorg-hwe-16.04 -y
 cd ~
-sleep 5
 sudo sed -i -e "s/quiet splash/text/g" /etc/default/grub
 sudo sed -i -e 's#GRUB_CMDLINE_LINUX=""#GRUB_CMDLINE_LINUX="amddgpu.vm_fragment_size=9"#g' /etc/default/grub
 sudo update-grub2
 sudo apt dist-upgrade -y
 sudo apt-get remove linux-image-4.4.0-116* linux-headers-4.4.0-116* -y
+sudo apt install ethereum git screen htop curl ntp pv git cmake libcryptopp-dev libleveldb-dev libjsoncpp-dev \
+build-essential libcurl4-gnutls-dev libboost-all-dev libgmp-dev \
+libreadline-dev libmicrohttpd-dev libjansson-dev libgmp-dev libssl-dev unzip python-nfqueue python-scapy mesa-common-dev -y
+sudo apt-get install --install-recommends xserver-xorg-hwe-16.04 -y
 
 if [ $ROCM_ = "YES" ]
  then
@@ -279,7 +280,52 @@ if [ $XMRIG_AMD = "YES" ]
 then
 echo -e "\n\e[95mInstall XMRIG-AMD:\e[0m"
 cd ~
-git clone https://github.com/xmrig/xmrig-amd.git
+git clone https://github.com/xmrig/xmrig-amd.git xmrig_amd
+cd /tmp/
+if ! [ -d libuv ]; then git clone https://github.com/libuv/libuv.git ;fi
+cd libuv
+./autogen.sh
+./configure
+make -j $(nproc)
+sudo make install
+sudo ldconfig
+cd ~
+cd xmrig_amd
+if ! [ -f patch_donate.patch ]
+then
+cat <<'EOF'>> patch_donate.patch
+diff --git a/src/donate.h b/src/donate.h
+index 46f26b7..67a9cb0 100644
+--- a/src/donate.h
++++ b/src/donate.h
+@@ -43,8 +43,8 @@
+  * XMR: 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8n$
+  * BTC: 1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT
+  */
+-constexpr const int kDefaultDonateLevel = 5;
+-constexpr const int kMinimumDonateLevel = 1;
++constexpr const int kDefaultDonateLevel = 0;
++constexpr const int kMinimumDonateLevel = 0;
+
+
+ #endif /* __DONATE_H__ */
+EOF
+patch -p1 <patch_donate.patch
+fi
+if ! [ -d build ];then mkdir build; fi
+cd build
+cmake ..
+make -j $(nproc)
+cd ~
+if ! [ -f xmrig-amd ]; then ln -s xmrig_amd/build/xmrig-amd xmrig-amd;fi
+echo "Done."
+fi
+
+if [ $XMRIG_CPU = "YES" ]
+then
+echo -e "\n\e[95mInstall XMRIG-AMD:\e[0m"
+cd ~
+git clone https://github.com/xmrig/xmrig.git xmrig_cpu
 cd /tmp/
 if ! [ -d libuv ]; then git clone https://github.com/libuv/libuv.git ;fi
 cd libuv
@@ -289,7 +335,7 @@ make -j $(nproc)
 sudo make install
 sudo ldconfig
 cd ~
-cd xmrig-amd
+cd xmrig_cpu
 if ! [ -f patch_donate.patch ]
 then
 cat <<'EOF'>> patch_donate.patch
@@ -316,7 +362,7 @@ cd build
 cmake ..
 make -j $(nproc)
 cd ~
-if ! [ -f xmrig ]; then ln -s xmrig-amd/build/xmrig-amd xmrig;fi
+if ! [ -f xmrig ]; then ln -s xmrig_cpu/build/xmrig xmrig-cpu;fi
 echo "Done."
 fi