aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAnton Evangelatov <anton.evangelatov@gmail.com>2018-08-17 16:33:39 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-08-17 16:33:39 +0800
commitf44046a1c6889049dbf0f9448075a43f5b280b09 (patch)
tree9f2385d1c2f1509d4f108dce019bf9e46409d2a8 /build
parent2a06791461190b995e67d1c02f44fb358dbd9020 (diff)
downloaddexon-f44046a1c6889049dbf0f9448075a43f5b280b09.tar.gz
dexon-f44046a1c6889049dbf0f9448075a43f5b280b09.tar.zst
dexon-f44046a1c6889049dbf0f9448075a43f5b280b09.zip
build: do not require `ethereum-swarm` deb when installing `ethereum` (#17425)
Diffstat (limited to 'build')
-rw-r--r--build/ci.go11
-rw-r--r--build/deb/ethereum/deb.control2
2 files changed, 1 insertions, 12 deletions
diff --git a/build/ci.go b/build/ci.go
index ff23e15fd..40252cbde 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -644,17 +644,6 @@ func (meta debMetadata) ExeName(exe debExecutable) string {
return exe.Package()
}
-// EthereumSwarmPackageName returns the name of the swarm package based on
-// environment, e.g. "ethereum-swarm-unstable", or "ethereum-swarm".
-// This is needed so that we make sure that "ethereum" package,
-// depends on and installs "ethereum-swarm"
-func (meta debMetadata) EthereumSwarmPackageName() string {
- if isUnstableBuild(meta.Env) {
- return debSwarm.Name + "-unstable"
- }
- return debSwarm.Name
-}
-
// ExeConflicts returns the content of the Conflicts field
// for executable packages.
func (meta debMetadata) ExeConflicts(exe debExecutable) string {
diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control
index e693d1d04..defb106fe 100644
--- a/build/deb/ethereum/deb.control
+++ b/build/deb/ethereum/deb.control
@@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/ethereum/go-ethereum
Package: {{.Name}}
Architecture: any
-Depends: ${misc:Depends}, {{.EthereumSwarmPackageName}}, {{.ExeList}}
+Depends: ${misc:Depends}, {{.ExeList}}
Description: Meta-package to install geth, swarm, and other tools
Meta-package to install geth, swarm and other tools