From 09cbb08cef135a98f0b55a68291773ae80d1c781 Mon Sep 17 00:00:00 2001 From: Serhii Kostiuk Date: Thu, 17 Nov 2022 10:43:06 +0200 Subject: Revert "Docker: Fixed builds after updating to Golang 1.16.x" This reverts commit 127aa9bbd8e2c750b9eca734678527d7285abbb4. Reverted the commit to prevent build issues on Atmel. Atmel devices have no "meta-virtualization" layer, no docker recipes and hence bbappends for such recipes cause the build issues. bbappends moved to meta-mlinux-ti. --- recipes-containers/containerd/containerd-docker_%.bbappend | 6 ------ recipes-containers/containerd/containerd-opencontainers_%.bbappend | 6 ------ recipes-containers/docker/docker-moby.bbappend | 6 ------ recipes-containers/runc/runc-docker_%.bbappend | 6 ------ recipes-containers/runc/runc-opencontainers_%.bbappend | 6 ------ 5 files changed, 30 deletions(-) delete mode 100644 recipes-containers/containerd/containerd-docker_%.bbappend delete mode 100644 recipes-containers/containerd/containerd-opencontainers_%.bbappend delete mode 100644 recipes-containers/docker/docker-moby.bbappend delete mode 100644 recipes-containers/runc/runc-docker_%.bbappend delete mode 100644 recipes-containers/runc/runc-opencontainers_%.bbappend diff --git a/recipes-containers/containerd/containerd-docker_%.bbappend b/recipes-containers/containerd/containerd-docker_%.bbappend deleted file mode 100644 index bfedff1..0000000 --- a/recipes-containers/containerd/containerd-docker_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# Fix build issues with Go version 1.16.x. Remove this bbappend in Yocto -# version 3.3 and newer. -# Fix in the upstream Yocto: https://git.yoctoproject.org/meta-virtualization/commit/recipes-containers/containerd/containerd-opencontainers_git.bb?h=hardknott&id=8597d4e3a973ac7e78483fb3ab0e19dbcc681913. -do_compile_prepend() { - export GO111MODULE=off -} diff --git a/recipes-containers/containerd/containerd-opencontainers_%.bbappend b/recipes-containers/containerd/containerd-opencontainers_%.bbappend deleted file mode 100644 index bfedff1..0000000 --- a/recipes-containers/containerd/containerd-opencontainers_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# Fix build issues with Go version 1.16.x. Remove this bbappend in Yocto -# version 3.3 and newer. -# Fix in the upstream Yocto: https://git.yoctoproject.org/meta-virtualization/commit/recipes-containers/containerd/containerd-opencontainers_git.bb?h=hardknott&id=8597d4e3a973ac7e78483fb3ab0e19dbcc681913. -do_compile_prepend() { - export GO111MODULE=off -} diff --git a/recipes-containers/docker/docker-moby.bbappend b/recipes-containers/docker/docker-moby.bbappend deleted file mode 100644 index fba7110..0000000 --- a/recipes-containers/docker/docker-moby.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# Fix build issues with Go version 1.16.x. Remove this bbappend in Yocto -# version 3.3 and newer. -# Fix in the upstream Yocto: https://git.yoctoproject.org/meta-virtualization/commit/recipes-containers/docker/docker-moby.bb?h=hardknott&id=dc1713bec31ecd52a9715fd528253b26140f69d3 -do_compile_prepend() { - export GO111MODULE=off -} diff --git a/recipes-containers/runc/runc-docker_%.bbappend b/recipes-containers/runc/runc-docker_%.bbappend deleted file mode 100644 index 5755da5..0000000 --- a/recipes-containers/runc/runc-docker_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# Fix build issues with Go version 1.16.x. Remove this bbappend in Yocto -# version 3.3 and newer. The new versions of `runc` do NOT require this -# hack, they should work properly with `GO111MODULE` and Golang 1.16.x: -do_compile_prepend() { - export GO111MODULE=off -} diff --git a/recipes-containers/runc/runc-opencontainers_%.bbappend b/recipes-containers/runc/runc-opencontainers_%.bbappend deleted file mode 100644 index 5755da5..0000000 --- a/recipes-containers/runc/runc-opencontainers_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# Fix build issues with Go version 1.16.x. Remove this bbappend in Yocto -# version 3.3 and newer. The new versions of `runc` do NOT require this -# hack, they should work properly with `GO111MODULE` and Golang 1.16.x: -do_compile_prepend() { - export GO111MODULE=off -} -- cgit v1.2.3