From d4f36f3ff5e33d243a8c149e47cb7adac4dc315a Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 24 May 2024 03:43:09 +0000 Subject: docker-compose: adapt SRC_URI to include destsuffix=${GO_SRCURI_DESTSUFFIX} As of commit cc4ec43a2b657fb4c58429ab14f1edc2473c1327 [go: Drop fork of unpack code, mandate GO_SRCURI_DESTSUFFIX] we require this variable in our go recipes. We also adjust our WORKDIR reference to UNPACKDIR, and the destination for vendor'd source. Signed-off-by: Bruce Ashfield --- recipes-containers/docker-compose/docker-compose_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-containers/docker-compose/docker-compose_git.bb') diff --git a/recipes-containers/docker-compose/docker-compose_git.bb b/recipes-containers/docker-compose/docker-compose_git.bb index 07650126..316bf29d 100644 --- a/recipes-containers/docker-compose/docker-compose_git.bb +++ b/recipes-containers/docker-compose/docker-compose_git.bb @@ -11,7 +11,7 @@ DEPENDS = " \ SRCREV_FORMAT="compose_survey" SRCREV_compose = "3371227794f5f3645f4f19829c60a741635ed329" -SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https" +SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" include src_uri.inc @@ -55,7 +55,7 @@ do_compile() { # our copied .go files are to be used for the build ln -sf vendor.copy vendor # inform go that we know what we are doing - cp ${WORKDIR}/modules.txt vendor/ + cp ${UNPACKDIR}/modules.txt vendor/ GO_LDFLAGS="-s -w -X internal.Version=${PV} -X ${COMPOSE_PKG}/internal.Version=${PV}" GO_BUILDTAGS="" -- cgit v1.2.3-54-g00ecf