From 82045f0fd4db9e54b64e062b87ebf6da57aae8c9 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 20 Jul 2023 10:17:18 +0200 Subject: [PATCH] overlay app-containers/docker-cli: reset to Gentoo Reset to the state according to the state of Gentoo upstream, to commit b93160fedf4e7a6f7f4101dfb7f3ff0df5cee2c0. to create Flatcar patches on top of that. --- .../docker-cli/docker-cli-20.10.24.ebuild | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/docker-cli/docker-cli-20.10.24.ebuild b/sdk_container/src/third_party/coreos-overlay/app-containers/docker-cli/docker-cli-20.10.24.ebuild index 27e4a3545c..aefc34e0e1 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-containers/docker-cli/docker-cli-20.10.24.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-containers/docker-cli/docker-cli-20.10.24.ebuild @@ -5,10 +5,7 @@ EAPI=7 GIT_COMMIT=e78084afe5 EGO_PN="github.com/docker/cli" -COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.19" - -inherit bash-completion-r1 golang-vcs-snapshot coreos-go-depend +inherit bash-completion-r1 golang-vcs-snapshot DESCRIPTION="the command line binary for docker" HOMEPAGE="https://www.docker.com/" @@ -32,23 +29,17 @@ src_prepare() { } src_compile() { - # Flatcar: override go version - go_export - export DISABLE_WARN_OUTSIDE_CONTAINER=1 export GOPATH="${WORKDIR}/${P}" # setup CFLAGS and LDFLAGS for separate build target # see https://github.com/tianon/docker-overlay/pull/10 - # FLatcar: inject our own CFLAGS/LDFLAGS for torcx - export CGO_CFLAGS="${CGO_CFLAGS} -I${SYSROOT}/usr/include" - export CGO_LDFLAGS="${CGO_LDFLAGS} -L${SYSROOT}/usr/$(get_libdir)" + export CGO_CFLAGS="-I${SYSROOT}/usr/include" + export CGO_LDFLAGS="-L${SYSROOT}/usr/$(get_libdir)" emake \ LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ VERSION="${PV}" \ GITCOMMIT="${GIT_COMMIT}" \ dynbinary - - # Flatcar: removed man page generation since they are not included in images } src_install() {