build/deb: fix deb.control for ethereum-swarm (#1414)
* build/deb: fix deb.control for ethereum-swarm * build: env.sh fix
This commit is contained in:
committed by
Rafael Matias
parent
809165fc5e
commit
1c8c8bac45
@ -4,9 +4,9 @@ Priority: extra
|
|||||||
Maintainer: {{.Author}}
|
Maintainer: {{.Author}}
|
||||||
Build-Depends: debhelper (>= 8.0.0), golang-1.11
|
Build-Depends: debhelper (>= 8.0.0), golang-1.11
|
||||||
Standards-Version: 3.9.5
|
Standards-Version: 3.9.5
|
||||||
Homepage: https://ethereum.org
|
Homepage: https://swarm.ethereum.org
|
||||||
Vcs-Git: git://github.com/ethereum/go-ethereum.git
|
Vcs-Git: git://github.com/ethersphere/swarm.git
|
||||||
Vcs-Browser: https://github.com/ethereum/go-ethereum
|
Vcs-Browser: https://github.com/ethersphere/swarm
|
||||||
|
|
||||||
{{range .Executables}}
|
{{range .Executables}}
|
||||||
Package: {{$.ExeName .}}
|
Package: {{$.ExeName .}}
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
{{.Name}} ({{.VersionString}}) {{.Distro}}; urgency=low
|
|
||||||
|
|
||||||
* git build of {{.Env.Commit}}
|
|
||||||
|
|
||||||
-- {{.Author}} {{.Time}}
|
|
@ -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}}
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
|
@ -1 +0,0 @@
|
|||||||
AUTHORS
|
|
@ -1 +0,0 @@
|
|||||||
build/bin/{{.BinaryName}} usr/bin
|
|
@ -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 $@
|
|
10
build/env.sh
10
build/env.sh
@ -10,11 +10,11 @@ fi
|
|||||||
# Create fake Go workspace if it doesn't exist yet.
|
# Create fake Go workspace if it doesn't exist yet.
|
||||||
workspace="$PWD/build/_workspace"
|
workspace="$PWD/build/_workspace"
|
||||||
root="$PWD"
|
root="$PWD"
|
||||||
ethdir="$workspace/src/github.com/ethereum"
|
ethdir="$workspace/src/github.com/ethersphere"
|
||||||
if [ ! -L "$ethdir/go-ethereum" ]; then
|
if [ ! -L "$ethdir/swarm" ]; then
|
||||||
mkdir -p "$ethdir"
|
mkdir -p "$ethdir"
|
||||||
cd "$ethdir"
|
cd "$ethdir"
|
||||||
ln -s ../../../../../. go-ethereum
|
ln -s ../../../../../. swarm
|
||||||
cd "$root"
|
cd "$root"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -23,8 +23,8 @@ GOPATH="$workspace"
|
|||||||
export GOPATH
|
export GOPATH
|
||||||
|
|
||||||
# Run the command inside the workspace.
|
# Run the command inside the workspace.
|
||||||
cd "$ethdir/go-ethereum"
|
cd "$ethdir/swarm"
|
||||||
PWD="$ethdir/go-ethereum"
|
PWD="$ethdir/swarm"
|
||||||
|
|
||||||
# Launch the arguments with the configured environment.
|
# Launch the arguments with the configured environment.
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
Reference in New Issue
Block a user