-
Notifications
You must be signed in to change notification settings - Fork 698
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
etcd: remove gobin requirement for build
This tool is installed as a part of the build process (build.sh sources test_lib.sh) This tool has been removed in the latest etcd main branch. Installing it as a part of the build process breaks bitbake (it doesn't allow downloading of packages once in the build steps). This tool is not needed to build etcd (it appears to be used for some optional test cases). The following upstream commit removes the use of gobin in the main branch, but it's not clear to me if the alternative of just running "go install" will fix this issue. Fundamentally etcd allows package install during build and bitbake does not: etcd-io/etcd@900fc8d Upstream-Status: Inappropriate Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
- Loading branch information
1 parent
4942d4a
commit 68da897
Showing
2 changed files
with
51 additions
and
2 deletions.
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
...e/recipes-extended/etcd/etcd/0001-test_lib.sh-remove-gobin-requirement-during-build.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
From a57d78a94e7cbc8cfa468b58c7d4e23668c05fec Mon Sep 17 00:00:00 2001 | ||
From: Andrew Geissler <geissonator@yahoo.com> | ||
Date: Tue, 2 May 2023 13:36:36 -0600 | ||
Subject: [PATCH] test_lib.sh: remove gobin requirement during build | ||
|
||
This tool is installed as a part of the build process (build.sh sources | ||
test_lib.sh) | ||
|
||
This tool has been removed in the latest etcd main branch. Installing it | ||
as a part of the build process breaks bitbake (it doesn't allow | ||
downloading of packages once in the build steps). | ||
|
||
This tool is not needed to build etcd (it appears to be used for some | ||
optional test cases). | ||
|
||
Signed-off-by: Andrew Geissler <geissonator@yahoo.com> | ||
--- | ||
scripts/test_lib.sh | 8 ++++++-- | ||
1 file changed, 6 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh | ||
index 44b9d2895..da97a9c26 100644 | ||
--- a/scripts/test_lib.sh | ||
+++ b/scripts/test_lib.sh | ||
@@ -140,7 +140,7 @@ function run { | ||
command=("${command[@]@Q}") | ||
if [[ "${rpath}" != "." && "${rpath}" != "" ]]; then | ||
repro="(cd ${rpath} && ${command[*]})" | ||
- else | ||
+ else | ||
repro="${command[*]}" | ||
fi | ||
|
||
@@ -305,7 +305,11 @@ function tool_exists { | ||
|
||
# Ensure gobin is available, as it runs majority of the tools | ||
if ! command -v "gobin" >/dev/null; then | ||
- run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1 | ||
+ # This script is run as a part of the build process. Installing packages | ||
+ # during the build process is not allowed in bitbake. | ||
+ # Gobin is deprecated and not needed when building in the bitbake env | ||
+ echo "Not installing gobin in bitbake env" | ||
+ # run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1 | ||
fi | ||
|
||
# tool_get_bin [tool] - returns absolute path to a tool binary (or returns error) | ||
-- | ||
2.37.1 (Apple Git-137.1) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters