roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

build: do not require ethereum-swarm deb when installing ethereum (#17425)

Browse Source
This commit is contained in:
Anton Evangelatov 2018-08-17 10:33:39 +02:00 committed by Péter Szilágyi
parent 2a06791461
commit f44046a1c6
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/ci.go
View File

@ -644,17 +644,6 @@ func (meta debMetadata) ExeName(exe debExecutable) string {
return exe.Package() 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 // ExeConflicts returns the content of the Conflicts field
// for executable packages. // for executable packages.
func (meta debMetadata) ExeConflicts(exe debExecutable) string { func (meta debMetadata) ExeConflicts(exe debExecutable) string {

2
build/deb/ethereum/deb.control
View File

@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/ethereum/go-ethereum
Package: {{.Name}} Package: {{.Name}}
Architecture: any Architecture: any
Depends: ${misc:Depends}, {{.EthereumSwarmPackageName}}, {{.ExeList}} Depends: ${misc:Depends}, {{.ExeList}}
Description: Meta-package to install geth, swarm, and other tools Description: Meta-package to install geth, swarm, and other tools
Meta-package to install geth, swarm and other tools Meta-package to install geth, swarm and other tools