aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2018-09-21 05:33:26 +0800
committerGitHub <noreply@github.com>2018-09-21 05:33:26 +0800
commit32c05e82a379a00f42bfae5ea490867575f80a6d (patch)
treeceedc41ca3a5bbfe6d2fa52efa628067cde96565
parent457e930f27242381db5b5fe185c30bed9a5f2f89 (diff)
parent5e32152c02d99ff91bd46c5360da1df6e070d385 (diff)
downloaddexon-32c05e82a379a00f42bfae5ea490867575f80a6d.tar
dexon-32c05e82a379a00f42bfae5ea490867575f80a6d.tar.gz
dexon-32c05e82a379a00f42bfae5ea490867575f80a6d.tar.bz2
dexon-32c05e82a379a00f42bfae5ea490867575f80a6d.tar.lz
dexon-32c05e82a379a00f42bfae5ea490867575f80a6d.tar.xz
dexon-32c05e82a379a00f42bfae5ea490867575f80a6d.tar.zst
dexon-32c05e82a379a00f42bfae5ea490867575f80a6d.zip
Merge pull request #17726 from karalabe/go-1.11-ppa-fix
build/deb: upgrade launchpad PPA sources to Go 1.11 too
-rw-r--r--build/ci-notes.md6
-rw-r--r--build/deb/ethereum-swarm/deb.control2
-rw-r--r--build/deb/ethereum/deb.control2
3 files changed, 5 insertions, 5 deletions
diff --git a/build/ci-notes.md b/build/ci-notes.md
index f5b0e869d..a6bb32581 100644
--- a/build/ci-notes.md
+++ b/build/ci-notes.md
@@ -16,18 +16,18 @@ variable which Travis CI makes available to certain builds.
We want to build go-ethereum with the most recent version of Go, irrespective of the Go
version that is available in the main Ubuntu repository. In order to make this possible,
our PPA depends on the ~gophers/ubuntu/archive PPA. Our source package build-depends on
-golang-1.10, which is co-installable alongside the regular golang package. PPA dependencies
+golang-1.11, which is co-installable alongside the regular golang package. PPA dependencies
can be edited at https://launchpad.net/%7Eethereum/+archive/ubuntu/ethereum/+edit-dependencies
## Building Packages Locally (for testing)
You need to run Ubuntu to do test packaging.
-Add the gophers PPA and install Go 1.10 and Debian packaging tools:
+Add the gophers PPA and install Go 1.11 and Debian packaging tools:
$ sudo apt-add-repository ppa:gophers/ubuntu/archive
$ sudo apt-get update
- $ sudo apt-get install build-essential golang-1.10 devscripts debhelper
+ $ sudo apt-get install build-essential golang-1.11 devscripts debhelper
Create the source packages:
diff --git a/build/deb/ethereum-swarm/deb.control b/build/deb/ethereum-swarm/deb.control
index 8cd325bf5..b0ced141b 100644
--- a/build/deb/ethereum-swarm/deb.control
+++ b/build/deb/ethereum-swarm/deb.control
@@ -2,7 +2,7 @@ Source: {{.Name}}
Section: science
Priority: extra
Maintainer: {{.Author}}
-Build-Depends: debhelper (>= 8.0.0), golang-1.10
+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
diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control
index defb106fe..018067a19 100644
--- a/build/deb/ethereum/deb.control
+++ b/build/deb/ethereum/deb.control
@@ -2,7 +2,7 @@ Source: {{.Name}}
Section: science
Priority: extra
Maintainer: {{.Author}}
-Build-Depends: debhelper (>= 8.0.0), golang-1.10
+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