summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker-compose/docker-compose_git.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-05-24 03:43:09 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2024-05-29 13:16:56 +0000
commitd4f36f3ff5e33d243a8c149e47cb7adac4dc315a (patch)
tree407d9f8f56b022db3ec35ad52721515388917812 /recipes-containers/docker-compose/docker-compose_git.bb
parentfd3040500488126041e49ec665c9bcf6ed9b49ca (diff)
downloadmeta-virtualization-d4f36f3ff5e33d243a8c149e47cb7adac4dc315a.tar.gz
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 <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/docker-compose/docker-compose_git.bb')
-rw-r--r--recipes-containers/docker-compose/docker-compose_git.bb4
1 files changed, 2 insertions, 2 deletions
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 = " \
11SRCREV_FORMAT="compose_survey" 11SRCREV_FORMAT="compose_survey"
12SRCREV_compose = "3371227794f5f3645f4f19829c60a741635ed329" 12SRCREV_compose = "3371227794f5f3645f4f19829c60a741635ed329"
13 13
14SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https" 14SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}"
15 15
16include src_uri.inc 16include src_uri.inc
17 17
@@ -55,7 +55,7 @@ do_compile() {
55 # our copied .go files are to be used for the build 55 # our copied .go files are to be used for the build
56 ln -sf vendor.copy vendor 56 ln -sf vendor.copy vendor
57 # inform go that we know what we are doing 57 # inform go that we know what we are doing
58 cp ${WORKDIR}/modules.txt vendor/ 58 cp ${UNPACKDIR}/modules.txt vendor/
59 59
60 GO_LDFLAGS="-s -w -X internal.Version=${PV} -X ${COMPOSE_PKG}/internal.Version=${PV}" 60 GO_LDFLAGS="-s -w -X internal.Version=${PV} -X ${COMPOSE_PKG}/internal.Version=${PV}"
61 GO_BUILDTAGS="" 61 GO_BUILDTAGS=""