Do not version patch directories; we carry only one version of go.
Signed-off-by: Alexander Kanavin <[email protected]>
---
meta/recipes-devtools/go/{go-1.18.inc => go-1.18.1.inc} | 4 ++--
.../{go-binary-native_1.18.bb => go-binary-native_1.18.1.bb} | 4 ++--
...{go-cross-canadian_1.18.bb => go-cross-canadian_1.18.1.bb} | 0
.../go/{go-cross_1.18.bb => go-cross_1.18.1.bb} | 0
.../go/{go-crosssdk_1.18.bb => go-crosssdk_1.18.1.bb} | 0
.../go/{go-native_1.18.bb => go-native_1.18.1.bb} | 0
.../go/{go-runtime_1.18.bb => go-runtime_1.18.1.bb} | 0
...cmd-go-make-content-based-hash-generation-less-pedan.patch | 0
...0001-exec.go-do-not-write-linker-flags-into-buildids.patch | 0
...src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch | 0
...-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch | 0
.../0004-ld-add-soname-to-shareable-objects.patch | 0
...make.bash-override-CC-when-building-dist-and-go_boot.patch | 0
.../0006-cmd-dist-separate-host-and-target-builds.patch | 0
.../0007-cmd-go-make-GOROOT-precious-by-default.patch | 0
meta/recipes-devtools/go/{go_1.18.bb => go_1.18.1.bb} | 0
16 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/go/{go-1.18.inc => go-1.18.1.inc} (82%)
rename meta/recipes-devtools/go/{go-binary-native_1.18.bb =>
go-binary-native_1.18.1.bb} (83%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.18.bb =>
go-cross-canadian_1.18.1.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.18.bb => go-cross_1.18.1.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.18.bb => go-crosssdk_1.18.1.bb}
(100%)
rename meta/recipes-devtools/go/{go-native_1.18.bb => go-native_1.18.1.bb}
(100%)
rename meta/recipes-devtools/go/{go-runtime_1.18.bb => go-runtime_1.18.1.bb}
(100%)
rename meta/recipes-devtools/go/{go-1.18 =>
go}/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch (100%)
rename meta/recipes-devtools/go/{go-1.18 =>
go}/0001-exec.go-do-not-write-linker-flags-into-buildids.patch (100%)
rename meta/recipes-devtools/go/{go-1.18 =>
go}/0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch (100%)
rename meta/recipes-devtools/go/{go-1.18 =>
go}/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (100%)
rename meta/recipes-devtools/go/{go-1.18 =>
go}/0004-ld-add-soname-to-shareable-objects.patch (100%)
rename meta/recipes-devtools/go/{go-1.18 =>
go}/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (100%)
rename meta/recipes-devtools/go/{go-1.18 =>
go}/0006-cmd-dist-separate-host-and-target-builds.patch (100%)
rename meta/recipes-devtools/go/{go-1.18 =>
go}/0007-cmd-go-make-GOROOT-precious-by-default.patch (100%)
rename meta/recipes-devtools/go/{go_1.18.bb => go_1.18.1.bb} (100%)
diff --git a/meta/recipes-devtools/go/go-1.18.inc
b/meta/recipes-devtools/go/go-1.18.1.inc
similarity index 82%
rename from meta/recipes-devtools/go/go-1.18.inc
rename to meta/recipes-devtools/go/go-1.18.1.inc
index 54e241af10..64426471df 100644
--- a/meta/recipes-devtools/go/go-1.18.inc
+++ b/meta/recipes-devtools/go/go-1.18.1.inc
@@ -1,6 +1,6 @@
require go-common.inc
-FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go-1.18:"
+FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go:"
LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
@@ -14,4 +14,4 @@ SRC_URI += "\
file://0001-exec.go-do-not-write-linker-flags-into-buildids.patch \
file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
"
-SRC_URI[main.sha256sum] =
"38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6"
+SRC_URI[main.sha256sum] =
"efd43e0f1402e083b73a03d444b7b6576bb4c539ac46208b63a916b69aca4088"
diff --git a/meta/recipes-devtools/go/go-binary-native_1.18.bb
b/meta/recipes-devtools/go/go-binary-native_1.18.1.bb
similarity index 83%
rename from meta/recipes-devtools/go/go-binary-native_1.18.bb
rename to meta/recipes-devtools/go/go-binary-native_1.18.1.bb
index 500bb4ddcc..da9f39f428 100644
--- a/meta/recipes-devtools/go/go-binary-native_1.18.bb
+++ b/meta/recipes-devtools/go/go-binary-native_1.18.1.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
PROVIDES = "go-native"
SRC_URI =
"https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}";
-SRC_URI[go_linux_amd64.sha256sum] =
"e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f"
-SRC_URI[go_linux_arm64.sha256sum] =
"7ac7b396a691e588c5fb57687759e6c4db84a2a3bbebb0765f4b38e5b1c5b00e"
+SRC_URI[go_linux_amd64.sha256sum] =
"b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334"
+SRC_URI[go_linux_arm64.sha256sum] =
"56a91851c97fb4697077abbca38860f735c32b38993ff79b088dac46e4735633"
UPSTREAM_CHECK_URI = "https://golang.org/dl/";
UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.18.bb
b/meta/recipes-devtools/go/go-cross-canadian_1.18.1.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.18.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.18.1.bb
diff --git a/meta/recipes-devtools/go/go-cross_1.18.bb
b/meta/recipes-devtools/go/go-cross_1.18.1.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.18.bb
rename to meta/recipes-devtools/go/go-cross_1.18.1.bb
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.18.bb
b/meta/recipes-devtools/go/go-crosssdk_1.18.1.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.18.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.18.1.bb
diff --git a/meta/recipes-devtools/go/go-native_1.18.bb
b/meta/recipes-devtools/go/go-native_1.18.1.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-native_1.18.bb
rename to meta/recipes-devtools/go/go-native_1.18.1.bb
diff --git a/meta/recipes-devtools/go/go-runtime_1.18.bb
b/meta/recipes-devtools/go/go-runtime_1.18.1.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-runtime_1.18.bb
rename to meta/recipes-devtools/go/go-runtime_1.18.1.bb
diff --git
a/meta/recipes-devtools/go/go-1.18/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch
b/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch
similarity index 100%
rename from
meta/recipes-devtools/go/go-1.18/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch
rename to
meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch
diff --git
a/meta/recipes-devtools/go/go-1.18/0001-exec.go-do-not-write-linker-flags-into-buildids.patch
b/meta/recipes-devtools/go/go/0001-exec.go-do-not-write-linker-flags-into-buildids.patch
similarity index 100%
rename from
meta/recipes-devtools/go/go-1.18/0001-exec.go-do-not-write-linker-flags-into-buildids.patch
rename to
meta/recipes-devtools/go/go/0001-exec.go-do-not-write-linker-flags-into-buildids.patch
diff --git
a/meta/recipes-devtools/go/go-1.18/0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch
b/meta/recipes-devtools/go/go/0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch
similarity index 100%
rename from
meta/recipes-devtools/go/go-1.18/0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch
rename to
meta/recipes-devtools/go/go/0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch
diff --git
a/meta/recipes-devtools/go/go-1.18/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
b/meta/recipes-devtools/go/go/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
similarity index 100%
rename from
meta/recipes-devtools/go/go-1.18/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
rename to
meta/recipes-devtools/go/go/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
diff --git
a/meta/recipes-devtools/go/go-1.18/0004-ld-add-soname-to-shareable-objects.patch
b/meta/recipes-devtools/go/go/0004-ld-add-soname-to-shareable-objects.patch
similarity index 100%
rename from
meta/recipes-devtools/go/go-1.18/0004-ld-add-soname-to-shareable-objects.patch
rename to
meta/recipes-devtools/go/go/0004-ld-add-soname-to-shareable-objects.patch
diff --git
a/meta/recipes-devtools/go/go-1.18/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
b/meta/recipes-devtools/go/go/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
similarity index 100%
rename from
meta/recipes-devtools/go/go-1.18/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
rename to
meta/recipes-devtools/go/go/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
diff --git
a/meta/recipes-devtools/go/go-1.18/0006-cmd-dist-separate-host-and-target-builds.patch
b/meta/recipes-devtools/go/go/0006-cmd-dist-separate-host-and-target-builds.patch
similarity index 100%
rename from
meta/recipes-devtools/go/go-1.18/0006-cmd-dist-separate-host-and-target-builds.patch
rename to
meta/recipes-devtools/go/go/0006-cmd-dist-separate-host-and-target-builds.patch
diff --git
a/meta/recipes-devtools/go/go-1.18/0007-cmd-go-make-GOROOT-precious-by-default.patch
b/meta/recipes-devtools/go/go/0007-cmd-go-make-GOROOT-precious-by-default.patch
similarity index 100%
rename from
meta/recipes-devtools/go/go-1.18/0007-cmd-go-make-GOROOT-precious-by-default.patch
rename to
meta/recipes-devtools/go/go/0007-cmd-go-make-GOROOT-precious-by-default.patch
diff --git a/meta/recipes-devtools/go/go_1.18.bb
b/meta/recipes-devtools/go/go_1.18.1.bb
similarity index 100%
rename from meta/recipes-devtools/go/go_1.18.bb
rename to meta/recipes-devtools/go/go_1.18.1.bb
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#164901):
https://lists.openembedded.org/g/openembedded-core/message/164901
Mute This Topic: https://lists.openembedded.org/mt/90726566/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
