From 1408d6cf768cc3c88e9ab9efe98b0cb52ae3b537 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 1 May 2018 17:03:49 +0200 Subject: Revert #12769: Add systemd service to bitcoind in debian package After discussion with Matt on IRC, this is not ready for prime time until 2019 and shouldn't have been ACKed and merged. - Revert "Add systemd service for bitcoind" This reverts commit 2a87b1b07c5c4f8b9b34747c5f254c2ae1e824bf. - Revert "Sync contrib/debian from Matt Corallo's PPA" This reverts commit 9085532d35207c4a7690812ae82e476cf518d451. Tree-SHA512: 439f4ccc3e196011af448b220adf26b0e653ac589bf4cfbbc276c1500c9d08f209c9d6101e4d232857779d9f25164cfb222ed30e3d63de116f9121e6ebde31c3 --- contrib/debian/rules | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'contrib/debian/rules') diff --git a/contrib/debian/rules b/contrib/debian/rules index fcd0c39413..6885e38521 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -6,20 +6,13 @@ # $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_bitcoin) %: - dh --with bash-completion --with systemd $@ + dh --with bash-completion $@ override_dh_auto_clean: if [ -f Makefile ]; then $(MAKE) distclean; fi rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5) -# qt4 is very broken on arm -ifeq ($(findstring arm,$(shell uname -m)),arm) - QT=qt5 -endif -ifeq ($(findstring aarch64,$(shell uname -m)),aarch64) - QT=qt5 -endif # Yea, autogen should be run on the source archive, but I like doing git archive override_dh_auto_configure: @@ -27,23 +20,4 @@ override_dh_auto_configure: ./configure --with-gui=$(QT) override_dh_auto_test: -ifeq ($(QT), qt4) - xvfb-run -n 99 -l make check -else make check -endif - -# No SysV or Upstart init scripts included -override_dh_installinit: - dh_installinit \ - --noscripts - -# Don’t enable service by default -override_dh_systemd_enable: - dh_systemd_enable \ - --no-enable - -# Restart after upgrade -override_dh_systemd_start: - dh_systemd_start \ - --restart-after-upgrade -- cgit v1.2.3