diff --git a/contrib/debian/rules b/contrib/debian/rules --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -11,7 +11,6 @@ -DCLIENT_VERSION_IS_RELEASE=ON \ -DUSE_JEMALLOC=OFF \ -DBUILD_LIBBITCOINCONSENSUS=OFF \ - -DNETWORK_COMPATIBILITY=ABC \ -DBUILD_BITCOIN_SEEDER=OFF override_dh_auto_test: diff --git a/contrib/release/debian-packages.sh b/contrib/release/debian-packages.sh --- a/contrib/release/debian-packages.sh +++ b/contrib/release/debian-packages.sh @@ -10,11 +10,7 @@ # Focal: Ubuntu 20.04 LTS DEFAULT_DISTROS+=("focal") -DEFAULT_ABC_PPA="bitcoin-abc" -DEFAULT_BCHN_PPA="bitcoin-abc-bchn" -DEFAULT_NETWORK="ABC" -DEFAULT_CONTROL_SOURCE_NAME="bitcoinabc" - +DEFAULT_PPA="bitcoin-abc" DPUT_CONFIG_FILE=~/".dput.cf" TOPLEVEL="$(git rev-parse --show-toplevel)" KEYS_TXT="${TOPLEVEL}"/contrib/gitian-signing/keys.txt @@ -36,11 +32,9 @@ -D, --distro Name of the distribution to package for. Can be supplied multiple times. If supplied at least once, the defaults are ignored. Defaults to: '${DEFAULT_DISTROS[@]}' -h, --help Display this help message. --n, --network Select which network the node software will follow (ABC or BCHN). --p, --ppa PPA hostname. Defaults to: '${DEFAULT_ABC_PPA}' for ABC and '${DEFAULT_BCHN_PPA}' for BCHN. - If no config file exists at ${DPUT_CONFIG_FILE} then one will be created. - Setting this option to a hostname other than the default will require that you add the - necessary settings to the config file. +-p, --ppa PPA hostname. Defaults to: '${DEFAULT_PPA}'. If no config file exists at ${DPUT_CONFIG_FILE} + then one will be created using '${DEFAULT_PPA}'. Setting this option to a hostname other than + the default will require that you add the necessary settings to the config file. -v, --version Set the package version. Defaults to the version returned by 'bitcoind --version'. If set, version must be of the form: MAJOR.MINOR.REVISION[.OPTIONALPATCH] OPTIONALPATCH may be necessary when source files have changed but the version revision has not, @@ -48,13 +42,11 @@ EOF } -CONTROL_SOURCE_NAME="${DEFAULT_CONTROL_SOURCE_NAME}" DISTROS=() DRY_RUN="false" NUM_EXPECTED_ARGUMENTS=1 PACKAGE_VERSION="" -PPA="${DEFAULT_ABC_PPA}" -NETWORK="${DEFAULT_NETWORK}" +PPA="${DEFAULT_PPA}" # Parse command line arguments while [[ $# -ne 0 ]]; do @@ -72,22 +64,6 @@ help_message exit 0 ;; - -n|--network) - shift - case $1 in - ABC|BCHA) - NETWORK="ABC" - CONTROL_SOURCE_NAME=bitcoinabc - PPA="${DEFAULT_ABC_PPA}" - ;; - BCHN) - NETWORK="BCHN" - CONTROL_SOURCE_NAME=bitcoinabc-bchn - PPA="${DEFAULT_BCHN_PPA}" - ;; - esac - shift # shift past argument - ;; -p|--ppa) PPA="$2" shift # shift past argument @@ -159,19 +135,12 @@ if [ ! -f ${DPUT_CONFIG_FILE} ]; then echo "Info: No dput config file exists. Creating ${DPUT_CONFIG_FILE} now..." cat > ${DPUT_CONFIG_FILE} < debian/changelog <