From: Soumya Sambu <[email protected]>
Adjust patches and .bb to fix below error which occurs with devtool modify
command -
ERROR: Applying patch '0001-hack-lib-golang.sh-use-CC-from-environment.patch' on
target directory
CmdError('sh -c
\'PATCHFILE="0001-hack-lib-golang.sh-use-CC-from-environment.patch"
git -c user.name="OpenEmbedded" -c user.email="oe.patch@oe" commit -F
/tmp/tmp_ptvioq3
--author="Koen Kooi <[email protected]>"
--date="Mon, 23 Jul 2018 15:28:02 +0200"\'', 0, 'stdout: On branch devtool
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
(commit or discard the untracked or modified content in submodules)
\tmodified: src/import (modified content)
no changes added to commit (use "git add" and/or "git commit -a")
stderr: ')
This error is not seen on master branch, fixed with below commit -
[https://git.yoctoproject.org/meta-virtualization/commit/?id=d9af46db9aa9060c1ec10118b2cccabfc8264904]
Signed-off-by: Soumya Sambu <[email protected]>
---
...rated_files-Fix-race-issue-for-installi.patch | 16 +++++++++-------
...ng.sh-convert-remaining-go-calls-to-use.patch | 16 ++++++++--------
...0001-cross-don-t-build-tests-by-default.patch | 10 +++++-----
...k-lib-golang.sh-use-CC-from-environment.patch | 12 +++++++-----
recipes-containers/kubernetes/kubernetes_git.bb | 8 ++++----
5 files changed, 33 insertions(+), 29 deletions(-)
diff --git
a/recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch
b/recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch
index 02bb5e91..1b08b8c3 100644
---
a/recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch
+++
b/recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch
@@ -1,7 +1,7 @@
From 441df8a24a2c80e320f140b5d9bc352c7ce8a64a Mon Sep 17 00:00:00 2001
From: Robert Yang <[email protected]>
Date: Thu, 15 Oct 2020 07:27:35 +0000
-Subject: [PATCH] src/import/build/root/Makefile.generated_files: Fix race
issue for installing
+Subject: [PATCH] src/import/build/root/Makefile.generated_files: Fix race
issue for installing
go2make
The src/import/build/root/Makefile.generated_files are called several times
during the build, so the
@@ -25,14 +25,14 @@ Upstream-Status: Pending
Signed-off-by: Robert Yang <[email protected]>
---
- src/import/build/root/Makefile.generated_files | 4 +++-
+ build/root/Makefile.generated_files | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-Index:
kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/build/root/Makefile.generated_files
-===================================================================
----
kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630.orig/src/import/build/root/Makefile.generated_files
-+++
kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/build/root/Makefile.generated_files
-@@ -67,7 +67,9 @@
+diff --git a/build/root/Makefile.generated_files
b/build/root/Makefile.generated_files
+index d86a90cbb39..19a3d332476 100644
+--- a/build/root/Makefile.generated_files
++++ b/build/root/Makefile.generated_files
+@@ -67,7 +67,9 @@ $(META_DIR)/$(GO_PKGDEPS_FILE): FORCE
if [[ "$(DBG_CODEGEN)" == 1 ]]; then \
echo "DBG: calculating Go dependencies"; \
fi
@@ -43,3 +43,5 @@ Index:
kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import
hack/run-in-gopath.sh go2make \
k8s.io/kubernetes/... \
--prune k8s.io/kubernetes/staging \
+--
+2.40.0
diff --git
a/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch
b/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch
index 8adbafb3..00425c7d 100644
---
a/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch
+++
b/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch
@@ -8,11 +8,11 @@ Signed-off-by: Bruce Ashfield <[email protected]>
hack/lib/golang.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/src/import/hack/lib/golang.sh b/src/import/hack/lib/golang.sh
-index e9148ec08fa..71d3c987563 100755
---- a/src/import/hack/lib/golang.sh
-+++ b/src/import/hack/lib/golang.sh
-@@ -651,7 +651,7 @@ kube::golang::build_some_binaries() {
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index d0f4b00dadf..cef0c2075a3 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -654,7 +654,7 @@ kube::golang::build_some_binaries() {
kube::golang::create_coverage_dummy_test "${package}"
kube::util::trap_add "kube::golang::delete_coverage_dummy_test
\"${package}\"" EXIT
@@ -21,7 +21,7 @@ index e9148ec08fa..71d3c987563 100755
-covermode count \
-coverpkg k8s.io/...,k8s.io/kubernetes/vendor/k8s.io/... \
"${build_args[@]}" \
-@@ -663,13 +663,13 @@ kube::golang::build_some_binaries() {
+@@ -666,13 +666,13 @@ kube::golang::build_some_binaries() {
done
if [[ "${#uncovered[@]}" != 0 ]]; then
V=2 kube::log::info "Building ${uncovered[*]} without coverage..."
@@ -37,7 +37,7 @@ index e9148ec08fa..71d3c987563 100755
fi
}
-@@ -725,7 +725,7 @@ kube::golang::build_binaries_for_platform() {
+@@ -730,7 +730,7 @@ kube::golang::build_binaries_for_platform() {
testpkg=$(dirname "${test}")
mkdir -p "$(dirname "${outfile}")"
@@ -47,5 +47,5 @@ index e9148ec08fa..71d3c987563 100755
-gcflags "${gogcflags:-}" \
-asmflags "${goasmflags:-}" \
--
-2.19.1
+2.40.0
diff --git
a/recipes-containers/kubernetes/kubernetes/0001-cross-don-t-build-tests-by-default.patch
b/recipes-containers/kubernetes/kubernetes/0001-cross-don-t-build-tests-by-default.patch
index 659e3013..cd5e46f1 100644
---
a/recipes-containers/kubernetes/kubernetes/0001-cross-don-t-build-tests-by-default.patch
+++
b/recipes-containers/kubernetes/kubernetes/0001-cross-don-t-build-tests-by-default.patch
@@ -15,10 +15,10 @@ Signed-off-by: Bruce Ashfield <[email protected]>
hack/make-rules/cross.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/src/import/hack/make-rules/cross.sh b/hack/make-rules/cross.sh
-index 8e1e938..0898c5c 100755
---- a/src/import/hack/make-rules/cross.sh
-+++ b/src/import/hack/make-rules/cross.sh
+diff --git a/hack/make-rules/cross.sh b/hack/make-rules/cross.sh
+index f8a6d0dbf5e..d22bf52b1cc 100755
+--- a/hack/make-rules/cross.sh
++++ b/hack/make-rules/cross.sh
@@ -33,6 +33,6 @@ make all WHAT="${KUBE_NODE_TARGETS[*]}"
KUBE_BUILD_PLATFORMS="${KUBE_NODE_PLATFO
make all WHAT="${KUBE_CLIENT_TARGETS[*]}"
KUBE_BUILD_PLATFORMS="${KUBE_CLIENT_PLATFORMS[*]}"
@@ -29,5 +29,5 @@ index 8e1e938..0898c5c 100755
-make all WHAT="${KUBE_TEST_SERVER_TARGETS[*]}"
KUBE_BUILD_PLATFORMS="${KUBE_TEST_SERVER_PLATFORMS[*]}"
+#make all WHAT="${KUBE_TEST_SERVER_TARGETS[*]}"
KUBE_BUILD_PLATFORMS="${KUBE_TEST_SERVER_PLATFORMS[*]}"
--
-2.7.4
+2.40.0
diff --git
a/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
b/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
index 3a22a2ef..8684a94a 100644
---
a/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
+++
b/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
@@ -11,11 +11,11 @@ Signed-off-by: Koen Kooi <[email protected]>
hack/lib/golang.sh | 4 ----
1 file changed, 4 deletions(-)
-Index:
kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/hack/lib/golang.sh
-===================================================================
----
kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630.orig/src/import/hack/lib/golang.sh
-+++
kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/hack/lib/golang.sh
-@@ -414,19 +414,15 @@
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index e16a60d1867..d0f4b00dadf 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -420,19 +420,15 @@ kube::golang::set_platform_envs() {
;;
"linux/arm")
export CGO_ENABLED=1
@@ -35,3 +35,5 @@ Index:
kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import
;;
esac
fi
+--
+2.40.0
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb
b/recipes-containers/kubernetes/kubernetes_git.bb
index f475bd73..59892c92 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -26,10 +26,10 @@ SRC_URI =
"git://github.com/kubernetes/kubernetes.git;branch=release-1.23;name=k
git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release;protocol=https"
SRC_URI:append = " \
- file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \
- file://0001-cross-don-t-build-tests-by-default.patch \
- file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch
\
-
file://0001-Makefile.generated_files-Fix-race-issue-for-installi.patch \
+
file://0001-hack-lib-golang.sh-use-CC-from-environment.patch;patchdir=src/import
\
+
file://0001-cross-don-t-build-tests-by-default.patch;patchdir=src/import \
+
file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch;patchdir=src/import
\
+
file://0001-Makefile.generated_files-Fix-race-issue-for-installi.patch;patchdir=src/import
\
file://cni-containerd-net.conflist \
file://k8s-init \
file://99-kubernetes.conf \
--
2.40.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8456):
https://lists.yoctoproject.org/g/meta-virtualization/message/8456
Mute This Topic: https://lists.yoctoproject.org/mt/102555494/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
