diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-11-02 17:48:40 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-03 08:21:12 +0000 |
| commit | 2cf8d92f44c25a15fdb0c1f1ea2aa5473e0c529e (patch) | |
| tree | c868d51beef87f0c32b6ecfc2f02a6fae3112646 /meta/recipes-devtools/go | |
| parent | bb986b420732175db713c6c8e2c3ed6dbd1ebaf9 (diff) | |
| download | poky-2cf8d92f44c25a15fdb0c1f1ea2aa5473e0c529e.tar.gz | |
go: upgrade 1.15.2 -> 1.15.3
Set PV directly to allow automated version updates between point releases.
(From OE-Core rev: 84034ea18a9fb1a012a1ecdc3a84296b08d3cc23)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go')
| -rw-r--r-- | meta/recipes-devtools/go/go-1.15.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-binary-native_1.15.3.bb (renamed from meta/recipes-devtools/go/go-binary-native_1.15.2.bb) | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-runtime_1.15.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go_1.15.bb | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-devtools/go/go-1.15.inc b/meta/recipes-devtools/go/go-1.15.inc index 97d748b922..a35921c1f8 100644 --- a/meta/recipes-devtools/go/go-1.15.inc +++ b/meta/recipes-devtools/go/go-1.15.inc | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | require go-common.inc | 1 | require go-common.inc |
| 2 | 2 | ||
| 3 | GO_BASEVERSION = "1.15" | 3 | GO_BASEVERSION = "1.15" |
| 4 | GO_MINOR = ".2" | 4 | PV = "1.15.3" |
| 5 | PV .= "${GO_MINOR}" | ||
| 6 | FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" | 5 | FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" |
| 7 | 6 | ||
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" |
| @@ -17,4 +16,4 @@ SRC_URI += "\ | |||
| 17 | file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ | 16 | file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ |
| 18 | file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ | 17 | file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ |
| 19 | " | 18 | " |
| 20 | SRC_URI[main.sha256sum] = "28bf9d0bcde251011caae230a4a05d917b172ea203f2a62f2c2f9533589d4b4d" | 19 | SRC_URI[main.sha256sum] = "896a602570e54c8cdfc2c1348abd4ffd1016758d0bd086ccd9787dbfc9b64888" |
diff --git a/meta/recipes-devtools/go/go-binary-native_1.15.2.bb b/meta/recipes-devtools/go/go-binary-native_1.15.3.bb index ccd2d5ebad..aeab91a80f 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.15.2.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.15.3.bb | |||
| @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" | |||
| 8 | PROVIDES = "go-native" | 8 | PROVIDES = "go-native" |
| 9 | 9 | ||
| 10 | SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" | 10 | SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" |
| 11 | SRC_URI[go_linux_amd64.sha256sum] = "b49fda1ca29a1946d6bb2a5a6982cf07ccd2aba849289508ee0f9918f6bb4552" | 11 | SRC_URI[go_linux_amd64.sha256sum] = "010a88df924a81ec21b293b5da8f9b11c176d27c0ee3962dc1738d2352d3c02d" |
| 12 | SRC_URI[go_linux_arm64.sha256sum] = "c8ec460cc82d61604b048f9439c06bd591722efce5cd48f49e19b5f6226bd36d" | 12 | SRC_URI[go_linux_arm64.sha256sum] = "b8b88a87ada918ef5189fa5938ef4c46a4f61952a34317612aaac705f4275f80" |
| 13 | 13 | ||
| 14 | UPSTREAM_CHECK_URI = "https://golang.org/dl/" | 14 | UPSTREAM_CHECK_URI = "https://golang.org/dl/" |
| 15 | UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" | 15 | UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" |
diff --git a/meta/recipes-devtools/go/go-runtime_1.15.bb b/meta/recipes-devtools/go/go-runtime_1.15.bb index 4eeee65e0c..d6ddb31ed4 100644 --- a/meta/recipes-devtools/go/go-runtime_1.15.bb +++ b/meta/recipes-devtools/go/go-runtime_1.15.bb | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | export CGO_ENABLED_riscv64 = "" | 1 | export CGO_ENABLED_riscv64 = "" |
| 2 | require go-${PV}.inc | 2 | require go-${PV}.inc |
| 3 | require go-runtime.inc | 3 | require go-runtime.inc |
| 4 | |||
diff --git a/meta/recipes-devtools/go/go_1.15.bb b/meta/recipes-devtools/go/go_1.15.bb index 4bf9dd50b2..cc4c3fe45d 100644 --- a/meta/recipes-devtools/go/go_1.15.bb +++ b/meta/recipes-devtools/go/go_1.15.bb | |||
| @@ -13,3 +13,4 @@ python() { | |||
| 13 | if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv' in d.getVar('TARGET_ARCH',True): | 13 | if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv' in d.getVar('TARGET_ARCH',True): |
| 14 | d.appendVar('INSANE_SKIP_%s' % d.getVar('PN',True), " textrel") | 14 | d.appendVar('INSANE_SKIP_%s' % d.getVar('PN',True), " textrel") |
| 15 | } | 15 | } |
| 16 | |||
