From bc2a750d5cd518706aff406da6e0719ce475e36b Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 25 Jun 2025 22:40:08 -0400 Subject: containers: adapt to UNPACKDIR changes This commit updates the container recipes to the OE core UNPACKDIR changes. - We drop references to WORKDIR - We adjust destsuffix fetches to use BB_GIT_DEFAULT_DESTSUFFIX instead of 'git' - Update our GOPATH references to use UNPACKDIR - Drop S = assignemnts where possible Signed-off-by: Bruce Ashfield --- recipes-containers/docker/docker-moby_git.bb | 2 +- recipes-containers/docker/docker.inc | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'recipes-containers/docker') diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb index dfbfa706..8910e2d3 100644 --- a/recipes-containers/docker/docker-moby_git.bb +++ b/recipes-containers/docker/docker-moby_git.bb @@ -49,7 +49,7 @@ SRCREV_cli = "068a01ea9470df6494cc92d9e64e240805ae47a7" SRCREV_FORMAT = "moby" SRC_URI = "\ git://github.com/moby/moby.git;nobranch=1;name=moby;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ - git://github.com/docker/cli;nobranch=1;name=cli;destsuffix=git/cli;protocol=https \ + git://github.com/docker/cli;nobranch=1;name=cli;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/cli;protocol=https \ file://docker.init \ file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \ file://0001-dynbinary-use-go-cross-compiler.patch;patchdir=src/import \ diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index 05a14f97..1567cdfe 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc @@ -31,11 +31,7 @@ PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" PACKAGECONFIG[docker-init] = ",,,docker-init" PACKAGECONFIG[transient-config] = "transient-config" - GO_IMPORT = "import" -S = "${WORKDIR}/git" - - inherit systemd update-rc.d inherit go -- cgit v1.2.3-54-g00ecf