From 1c8c8bac45e057d1bf0a140c6800b532f3a87762 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Mon, 3 Jun 2019 15:26:37 +0200 Subject: [PATCH] build/deb: fix deb.control for ethereum-swarm (#1414) * build/deb: fix deb.control for ethereum-swarm * build: env.sh fix --- build/deb/ethereum-swarm/deb.control | 6 +++--- build/deb/ethereum/deb.changelog | 5 ----- build/deb/ethereum/deb.control | 25 ------------------------- build/deb/ethereum/deb.copyright | 14 -------------- build/deb/ethereum/deb.docs | 1 - build/deb/ethereum/deb.install | 1 - build/deb/ethereum/deb.rules | 16 ---------------- build/env.sh | 10 +++++----- 8 files changed, 8 insertions(+), 70 deletions(-) delete mode 100644 build/deb/ethereum/deb.changelog delete mode 100644 build/deb/ethereum/deb.control delete mode 100644 build/deb/ethereum/deb.copyright delete mode 100644 build/deb/ethereum/deb.docs delete mode 100644 build/deb/ethereum/deb.install delete mode 100644 build/deb/ethereum/deb.rules diff --git a/build/deb/ethereum-swarm/deb.control b/build/deb/ethereum-swarm/deb.control index b0ced141b6..e868097518 100644 --- a/build/deb/ethereum-swarm/deb.control +++ b/build/deb/ethereum-swarm/deb.control @@ -4,9 +4,9 @@ Priority: extra Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.11 Standards-Version: 3.9.5 -Homepage: https://ethereum.org -Vcs-Git: git://github.com/ethereum/go-ethereum.git -Vcs-Browser: https://github.com/ethereum/go-ethereum +Homepage: https://swarm.ethereum.org +Vcs-Git: git://github.com/ethersphere/swarm.git +Vcs-Browser: https://github.com/ethersphere/swarm {{range .Executables}} Package: {{$.ExeName .}} diff --git a/build/deb/ethereum/deb.changelog b/build/deb/ethereum/deb.changelog deleted file mode 100644 index 83f804a833..0000000000 --- a/build/deb/ethereum/deb.changelog +++ /dev/null @@ -1,5 +0,0 @@ -{{.Name}} ({{.VersionString}}) {{.Distro}}; urgency=low - - * git build of {{.Env.Commit}} - - -- {{.Author}} {{.Time}} diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control deleted file mode 100644 index 018067a19d..0000000000 --- a/build/deb/ethereum/deb.control +++ /dev/null @@ -1,25 +0,0 @@ -Source: {{.Name}} -Section: science -Priority: extra -Maintainer: {{.Author}} -Build-Depends: debhelper (>= 8.0.0), golang-1.11 -Standards-Version: 3.9.5 -Homepage: https://ethereum.org -Vcs-Git: git://github.com/ethereum/go-ethereum.git -Vcs-Browser: https://github.com/ethereum/go-ethereum - -Package: {{.Name}} -Architecture: any -Depends: ${misc:Depends}, {{.ExeList}} -Description: Meta-package to install geth, swarm, and other tools - Meta-package to install geth, swarm and other tools - -{{range .Executables}} -Package: {{$.ExeName .}} -Conflicts: {{$.ExeConflicts .}} -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Built-Using: ${misc:Built-Using} -Description: {{.Description}} - {{.Description}} -{{end}} diff --git a/build/deb/ethereum/deb.copyright b/build/deb/ethereum/deb.copyright deleted file mode 100644 index fe6e36ad9d..0000000000 --- a/build/deb/ethereum/deb.copyright +++ /dev/null @@ -1,14 +0,0 @@ -Copyright 2018 The go-ethereum Authors - -go-ethereum is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -go-ethereum is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with go-ethereum. If not, see . diff --git a/build/deb/ethereum/deb.docs b/build/deb/ethereum/deb.docs deleted file mode 100644 index 62deb04972..0000000000 --- a/build/deb/ethereum/deb.docs +++ /dev/null @@ -1 +0,0 @@ -AUTHORS diff --git a/build/deb/ethereum/deb.install b/build/deb/ethereum/deb.install deleted file mode 100644 index e7666ce5fb..0000000000 --- a/build/deb/ethereum/deb.install +++ /dev/null @@ -1 +0,0 @@ -build/bin/{{.BinaryName}} usr/bin diff --git a/build/deb/ethereum/deb.rules b/build/deb/ethereum/deb.rules deleted file mode 100644 index 5280e0e55a..0000000000 --- a/build/deb/ethereum/deb.rules +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# Launchpad rejects Go's access to $HOME/.cache, use custom folder -export GOCACHE=/tmp/go-build - -override_dh_auto_build: - build/env.sh /usr/lib/go-1.11/bin/go run build/ci.go install -git-commit={{.Env.Commit}} -git-branch={{.Env.Branch}} -git-tag={{.Env.Tag}} -buildnum={{.Env.Buildnum}} -pull-request={{.Env.IsPullRequest}} - -override_dh_auto_test: - -%: - dh $@ diff --git a/build/env.sh b/build/env.sh index 3914555d1b..9b2090dbac 100755 --- a/build/env.sh +++ b/build/env.sh @@ -10,11 +10,11 @@ fi # Create fake Go workspace if it doesn't exist yet. workspace="$PWD/build/_workspace" root="$PWD" -ethdir="$workspace/src/github.com/ethereum" -if [ ! -L "$ethdir/go-ethereum" ]; then +ethdir="$workspace/src/github.com/ethersphere" +if [ ! -L "$ethdir/swarm" ]; then mkdir -p "$ethdir" cd "$ethdir" - ln -s ../../../../../. go-ethereum + ln -s ../../../../../. swarm cd "$root" fi @@ -23,8 +23,8 @@ GOPATH="$workspace" export GOPATH # Run the command inside the workspace. -cd "$ethdir/go-ethereum" -PWD="$ethdir/go-ethereum" +cd "$ethdir/swarm" +PWD="$ethdir/swarm" # Launch the arguments with the configured environment. exec "$@"