mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 22:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

partage stable docker 24: addressed PR feedback

Browse Source 
Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
This commit is contained in:
Thilo Fromm 2023-10-27 12:24:19 +02:00
parent 456b3687ed
commit f2a4b4a11e
5 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/changes/2023-10-25-docker-gentoo-upstream.md
View File

@ -2,3 +2,5 @@
- **NOTE** The docker btrfs storage driver has been de-prioritised; BTRFS backed storage will now default to the `overlay2` driver - **NOTE** The docker btrfs storage driver has been de-prioritised; BTRFS backed storage will now default to the `overlay2` driver
([changelog](https://docs.docker.com/engine/release-notes/23.0/#bug-fixes-and-enhancements-6), [upstream pr](https://github.com/moby/moby/pull/42661)). ([changelog](https://docs.docker.com/engine/release-notes/23.0/#bug-fixes-and-enhancements-6), [upstream pr](https://github.com/moby/moby/pull/42661)).
Using the btrfs driver can still be enforced by creating a respective [docker config](https://docs.docker.com/storage/storagedriver/btrfs-driver/#configure-docker-to-use-the-btrfs-storage-driver) at `/etc/docker/daemon.json`. Using the btrfs driver can still be enforced by creating a respective [docker config](https://docs.docker.com/storage/storagedriver/btrfs-driver/#configure-docker-to-use-the-btrfs-storage-driver) at `/etc/docker/daemon.json`.
- **NOTE that if you are using btrfs-backed Docker storage and are upgrading to this new version then the driver for that storage will change to `overlay2`.**
To prevent this please create a respective docker daemon configuration file on affected nodes as discussed above.

25
sdk_container/src/third_party/portage-stable/eclass/go-env.eclass vendored
View File

@ -1,4 +1,4 @@
# Copyright 2023 Flatcar Maintainers # Copyright 2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# @ECLASS: go-env.eclass # @ECLASS: go-env.eclass
@ -6,7 +6,6 @@
# Flatcar Maintainers <infra@flatcar.org> # Flatcar Maintainers <infra@flatcar.org>
# @AUTHOR: # @AUTHOR:
# Flatcar Maintainers <infra@flatcar.org> # Flatcar Maintainers <infra@flatcar.org>
# @SUPPORTED_EAPIS: 7 8
# @BLURB: Helper eclass for setting the Go compile environment. Required for cross-compiling. # @BLURB: Helper eclass for setting the Go compile environment. Required for cross-compiling.
# @DESCRIPTION: # @DESCRIPTION:
# This eclass includes a helper function for setting the compile environment for Go ebuilds. # This eclass includes a helper function for setting the compile environment for Go ebuilds.
@ -17,30 +16,28 @@ _GO_ENV_ECLASS=1
inherit toolchain-funcs inherit toolchain-funcs
# @FUNCTION: go-env_set_compile_environment
# @DESCRIPTION:
# Set up basic compile environment: CC, CXX, and GOARCH. # Set up basic compile environment: CC, CXX, and GOARCH.
# Required for cross-compiling with crossdev. # Required for cross-compiling with crossdev.
# If not set, host defaults will be used and the resulting binaries are host arch. # If not set, host defaults will be used and the resulting binaries are host arch.
# (e.g. "emerge-aarch64-cross-linux-gnu foo" run on x86_64 will emerge "foo" for x86_64 # (e.g. "emerge-aarch64-cross-linux-gnu foo" run on x86_64 will emerge "foo" for x86_64
# instead of aarch64) # instead of aarch64)
go-env_set_compile_environment() { go-env_set_compile_environment() {
_arch() {
local arch=$(tc-arch "${CHOST}}") local arch=$(tc-arch "${CHOST}}")
case "${arch}" in case "${arch}" in
x86) echo "386" ;; x86) GOARCH="386" ;;
x64-*) echo "amd64" ;; x64-*) GOARCH="amd64" ;;
ppc64) if [[ "$(tc-endian "${${CHOST}}")" = "big" ]] then ppc64) if [[ "$(tc-endian "${${CHOST}}")" = "big" ]] ; then
echo "ppc64" GOARCH="ppc64"
else else
echo "ppc64le" GOARCH="ppc64le"
fi ;; fi ;;
*) echo "${arch}" ;; *) GOARCH="${arch}" ;;
esac esac
}
CC="$(tc-getCC)" tc-export CC CXX
CXX="$(tc-getCXX)" export GOARCH
# Needs explicit export to arrive in go environment.
export GOARCH="$(_arch)"
} }
fi fi

2
sdk_container/src/third_party/portage-stable/eclass/go-module.eclass vendored
View File

@ -68,6 +68,7 @@ esac
if [[ -z ${_GO_MODULE_ECLASS} ]]; then if [[ -z ${_GO_MODULE_ECLASS} ]]; then
_GO_MODULE_ECLASS=1 _GO_MODULE_ECLASS=1
# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
inherit multiprocessing toolchain-funcs go-env inherit multiprocessing toolchain-funcs go-env
if [[ ! ${GO_OPTIONAL} ]]; then if [[ ! ${GO_OPTIONAL} ]]; then
@ -388,6 +389,7 @@ go-module_src_unpack() {
fi fi
fi fi
# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
go-env_set_compile_environment go-env_set_compile_environment
} }

2
sdk_container/src/third_party/portage-stable/eclass/golang-vcs-snapshot.eclass vendored
View File

@ -52,6 +52,7 @@ esac
if [[ -z ${_GOLANG_VCS_SNAPSHOT_ECLASS} ]]; then if [[ -z ${_GOLANG_VCS_SNAPSHOT_ECLASS} ]]; then
_GOLANG_VCS_SNAPSHOT_ECLASS=1 _GOLANG_VCS_SNAPSHOT_ECLASS=1
# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
inherit golang-base go-env inherit golang-base go-env
# @ECLASS_VARIABLE: EGO_VENDOR # @ECLASS_VARIABLE: EGO_VENDOR
@ -119,6 +120,7 @@ golang-vcs-snapshot_src_unpack() {
done done
fi fi
# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
go-env_set_compile_environment go-env_set_compile_environment
} }

2
sdk_container/src/third_party/portage-stable/eclass/golang-vcs.eclass vendored
View File

@ -20,6 +20,7 @@ esac
if [[ -z ${_GOLANG_VCS_ECLASS} ]]; then if [[ -z ${_GOLANG_VCS_ECLASS} ]]; then
_GOLANG_VCS_ECLASS=1 _GOLANG_VCS_ECLASS=1
# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
inherit estack golang-base go-env inherit estack golang-base go-env
PROPERTIES+=" live" PROPERTIES+=" live"
@ -86,6 +87,7 @@ _golang-vcs_env_setup() {
die "${ECLASS}: unable to create ${WORKDIR}/${P}" die "${ECLASS}: unable to create ${WORKDIR}/${P}"
return 0 return 0
# Flatcar: Keep this change until upstream has merged https://github.com/gentoo/gentoo/pull/33539
go-env_set_compile_environment go-env_set_compile_environment
} }