From cc5654cb59c455464059439c9b1df2f99f3bb435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Thu, 13 Apr 2017 14:11:33 +0300
Subject: [PATCH] build: bump launchpad builds to Go 1.8.1
---
build/ci-notes.md | 12 ++++++------
build/deb.control | 4 ++--
build/deb.rules | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build/ci-notes.md b/build/ci-notes.md
index cd2ba8bb2..7574bfffa 100644
--- a/build/ci-notes.md
+++ b/build/ci-notes.md
@@ -5,9 +5,9 @@ for Ubuntu. Packages are built for the all Ubuntu versions which are supported b
Canonical:
- Trusty Tahr (14.04 LTS)
-- Wily Werewolf (15.10)
- Xenial Xerus (16.04 LTS)
- Yakkety Yak (16.10)
+- Zesty Zapus (17.04)
Packages of develop branch commits have suffix -unstable and cannot be installed alongside
the stable version. Switching between release streams requires user intervention.
@@ -21,18 +21,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.7, which is co-installable alongside the regular golang package. PPA dependencies
+golang-1.8, 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.7 and Debian packaging tools:
+Add the gophers PPA and install Go 1.8 and Debian packaging tools:
$ sudo apt-add-repository ppa:gophers/ubuntu/archive
$ sudo apt-get update
- $ sudo apt-get install build-essential golang-1.7 devscripts debhelper
+ $ sudo apt-get install build-essential golang-1.8 devscripts debhelper
Create the source packages:
@@ -40,10 +40,10 @@ Create the source packages:
Then go into the source package directory for your running distribution and build the package:
- $ cd dist/ethereum-unstable-1.5.0+xenial
+ $ cd dist/ethereum-unstable-1.6.0+xenial
$ dpkg-buildpackage
Built packages are placed in the dist/ directory.
$ cd ..
- $ dpkg-deb -c geth-unstable_1.5.0+xenial_amd64.deb
+ $ dpkg-deb -c geth-unstable_1.6.0+xenial_amd64.deb
diff --git a/build/deb.control b/build/deb.control
index d39393d29..7394754ef 100644
--- a/build/deb.control
+++ b/build/deb.control
@@ -2,7 +2,7 @@ Source: {{.Name}}
Section: science
Priority: extra
Maintainer: {{.Author}}
-Build-Depends: debhelper (>= 8.0.0), golang-1.7
+Build-Depends: debhelper (>= 8.0.0), golang-1.8
Standards-Version: 3.9.5
Homepage: https://ethereum.org
Vcs-Git: git://github.com/ethereum/go-ethereum.git
@@ -13,7 +13,7 @@ Architecture: any
Depends: ${misc:Depends}, {{.ExeList}}
Description: Meta-package to install geth and other tools
Meta-package to install geth and other tools
-
+
{{range .Executables}}
Package: {{$.ExeName .}}
Conflicts: {{$.ExeConflicts .}}
diff --git a/build/deb.rules b/build/deb.rules
index 11efe15fc..b3fe5267f 100644
--- a/build/deb.rules
+++ b/build/deb.rules
@@ -5,7 +5,7 @@
#export DH_VERBOSE=1
override_dh_auto_build:
- build/env.sh /usr/lib/go-1.7/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}}
+ build/env.sh /usr/lib/go-1.8/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:
--
GitLab