From be0039855faef0f996966f3bc195ea418f2a40ab Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 25 Jun 2025 22:40:08 -0400 Subject: devtools: 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-devtools/go/compose-file_git.bb | 4 +--- recipes-devtools/go/go-build_git.bb | 3 +-- recipes-devtools/go/go-capability_git.bb | 2 -- recipes-devtools/go/go-cli_git.bb | 2 -- recipes-devtools/go/go-connections_git.bb | 4 +--- recipes-devtools/go/go-context_git.bb | 2 -- recipes-devtools/go/go-dbus_git.bb | 2 -- recipes-devtools/go/go-distribution_git.bb | 4 +--- recipes-devtools/go/go-fsnotify_git.bb | 2 -- recipes-devtools/go/go-libtrust_git.bb | 2 -- recipes-devtools/go/go-logrus_git.bb | 2 -- recipes-devtools/go/go-md2man_git.bb | 2 -- recipes-devtools/go/go-metalinter_git.bb | 2 -- recipes-devtools/go/go-mux_git.bb | 2 -- recipes-devtools/go/go-patricia_git.bb | 2 -- recipes-devtools/go/go-pty_git.bb | 2 -- recipes-devtools/go/go-systemd_git.bb | 2 -- recipes-devtools/go/grpc-go_git.bb | 4 +--- 18 files changed, 5 insertions(+), 40 deletions(-) (limited to 'recipes-devtools/go') diff --git a/recipes-devtools/go/compose-file_git.bb b/recipes-devtools/go/compose-file_git.bb index 7fedc407..64051b59 100644 --- a/recipes-devtools/go/compose-file_git.bb +++ b/recipes-devtools/go/compose-file_git.bb @@ -7,13 +7,11 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=9cd86830b557232ce55e2a6b4 SRCNAME = "compose-file" PKG_NAME = "github.com/aanand/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" +SRC_URI = "git://${PKG_NAME}.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/${PKG_NAME};branch=master;protocol=https" SRCREV = "a3e58764f50597b6217fec07e9bff7225c4a1719" PV = "3.0+git" -S = "${WORKDIR}/git" - # NO-OP the do compile rule because this recipe is source only. do_compile() { } diff --git a/recipes-devtools/go/go-build_git.bb b/recipes-devtools/go/go-build_git.bb index c0253298..8b750651 100644 --- a/recipes-devtools/go/go-build_git.bb +++ b/recipes-devtools/go/go-build_git.bb @@ -8,7 +8,7 @@ SRCREV_runc = "1e7bb5b773162b57333d57f612fd72e3f8612d94" SRCREV_FORMAT = "runx_runc" SRC_URI = "\ git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ - git://github.com/opencontainers/runc;branch=release-1.1;name=runc;protocol=https;destsuffix=git/src/import/gobuild/go/src/github.com/opencontainers/runc \ + git://github.com/opencontainers/runc;branch=release-1.1;name=runc;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/import/gobuild/go/src/github.com/opencontainers/runc \ file://0001-build-use-instead-of-go.patch \ " SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b" @@ -17,7 +17,6 @@ SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986c LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=945fc9aa694796a6337395cc291ddd8c" -S = "${WORKDIR}/git" PV = "0.1-git${SRCREV_runx}" inherit features_check diff --git a/recipes-devtools/go/go-capability_git.bb b/recipes-devtools/go/go-capability_git.bb index c2562474..b6146519 100644 --- a/recipes-devtools/go/go-capability_git.bb +++ b/recipes-devtools/go/go-capability_git.bb @@ -14,8 +14,6 @@ PV = "0.0+git" inherit meta-virt-depreciated-warning -S = "${WORKDIR}/git" - do_install() { install -d ${D}${prefix}/local/go/src/${PKG_NAME} cp -r ${S}/* ${D}${prefix}/local/go/src/${PKG_NAME}/ diff --git a/recipes-devtools/go/go-cli_git.bb b/recipes-devtools/go/go-cli_git.bb index 37f65c33..a7cda644 100644 --- a/recipes-devtools/go/go-cli_git.bb +++ b/recipes-devtools/go/go-cli_git.bb @@ -12,8 +12,6 @@ SRC_URI = "git://${PKG_NAME}.git;branch=main;protocol=https" SRCREV = "27ecc97192df1bf053a22b04463f2b51b8b8373e" PV = "1.1.0+git" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning do_install() { diff --git a/recipes-devtools/go/go-connections_git.bb b/recipes-devtools/go/go-connections_git.bb index 33bb83bf..5f22fdc6 100644 --- a/recipes-devtools/go/go-connections_git.bb +++ b/recipes-devtools/go/go-connections_git.bb @@ -7,13 +7,11 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=04424bc6f5a5be60691b9824d SRCNAME = "go-connections" PKG_NAME = "github.com/docker/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" +SRC_URI = "git://${PKG_NAME}.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/${PKG_NAME};branch=master;protocol=https" SRCREV = "4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366" PV = "0.2.1+git" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning # NO-OP the do compile rule because this recipe is source only. diff --git a/recipes-devtools/go/go-context_git.bb b/recipes-devtools/go/go-context_git.bb index 02f57875..2a101995 100644 --- a/recipes-devtools/go/go-context_git.bb +++ b/recipes-devtools/go/go-context_git.bb @@ -11,8 +11,6 @@ SRC_URI = "git://${PKG_NAME}.git;branch=main;protocol=https" SRCREV = "1cbd4c16de64273a6e63fc710b0d89bfad72cd32" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning do_compile() { diff --git a/recipes-devtools/go/go-dbus_git.bb b/recipes-devtools/go/go-dbus_git.bb index bc8691c4..652e7c43 100644 --- a/recipes-devtools/go/go-dbus_git.bb +++ b/recipes-devtools/go/go-dbus_git.bb @@ -12,8 +12,6 @@ SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "5f6efc7ef2759c81b7ba876593971bfce311eab3" PV = "4.0.0+git" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning do_install() { diff --git a/recipes-devtools/go/go-distribution_git.bb b/recipes-devtools/go/go-distribution_git.bb index 598df964..14494ad5 100644 --- a/recipes-devtools/go/go-distribution_git.bb +++ b/recipes-devtools/go/go-distribution_git.bb @@ -7,13 +7,11 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=d2794c0df5b907fdace235a61 SRCNAME = "distribution" PKG_NAME = "github.com/docker/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;branch=docker/1.13;destsuffix=git/src/${PKG_NAME};protocol=https" +SRC_URI = "git://${PKG_NAME}.git;branch=docker/1.13;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/${PKG_NAME};protocol=https" SRCREV = "28602af35aceda2f8d571bad7ca37a54cf0250bc" PV = "2.6.0+git" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning # NO-OP the do compile rule because this recipe is source only. diff --git a/recipes-devtools/go/go-fsnotify_git.bb b/recipes-devtools/go/go-fsnotify_git.bb index b934ae9a..72450290 100644 --- a/recipes-devtools/go/go-fsnotify_git.bb +++ b/recipes-devtools/go/go-fsnotify_git.bb @@ -12,8 +12,6 @@ SRC_URI = "git://${PKG_NAME}.git;branch=main;protocol=https" SRCREV = "af855d7e6014ec848882bb2ed7d40d536872d275" PV = "v1.5.1+git" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning do_install() { diff --git a/recipes-devtools/go/go-libtrust_git.bb b/recipes-devtools/go/go-libtrust_git.bb index 17199856..ef2877e1 100644 --- a/recipes-devtools/go/go-libtrust_git.bb +++ b/recipes-devtools/go/go-libtrust_git.bb @@ -12,8 +12,6 @@ SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "9cbd2a1374f46905c68a4eb3694a130610adc62a" PV = "0.0+git" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning do_install() { diff --git a/recipes-devtools/go/go-logrus_git.bb b/recipes-devtools/go/go-logrus_git.bb index 1826b893..aeb23a2b 100644 --- a/recipes-devtools/go/go-logrus_git.bb +++ b/recipes-devtools/go/go-logrus_git.bb @@ -12,8 +12,6 @@ SRC_URI = "git://${PKG_NAME};branch=master;protocol=https" SRCREV = "d26492970760ca5d33129d2d799e34be5c4782eb" PV = "0.11.0+git" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning do_install() { diff --git a/recipes-devtools/go/go-md2man_git.bb b/recipes-devtools/go/go-md2man_git.bb index 73d8d167..720eac63 100644 --- a/recipes-devtools/go/go-md2man_git.bb +++ b/recipes-devtools/go/go-md2man_git.bb @@ -14,8 +14,6 @@ SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https;destsuffix=${GO_S SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a" PV = "1.0.10+git" -S = "${WORKDIR}/git" - inherit go do_compile:prepend() { diff --git a/recipes-devtools/go/go-metalinter_git.bb b/recipes-devtools/go/go-metalinter_git.bb index def3d063..f5576080 100644 --- a/recipes-devtools/go/go-metalinter_git.bb +++ b/recipes-devtools/go/go-metalinter_git.bb @@ -14,8 +14,6 @@ SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "e8d801238da6f0dfd14078d68f9b53fa50a7eeb5" PV = "0.0+git" -S = "${WORKDIR}/git" - do_install() { install -d ${D}${prefix}/local/go/src/${PKG_NAME} cp -r ${S}/* ${D}${prefix}/local/go/src/${PKG_NAME}/ diff --git a/recipes-devtools/go/go-mux_git.bb b/recipes-devtools/go/go-mux_git.bb index 0958617a..5f158aa2 100644 --- a/recipes-devtools/go/go-mux_git.bb +++ b/recipes-devtools/go/go-mux_git.bb @@ -13,8 +13,6 @@ SRCREV = "85123bf20e069b156415b871dea10517f6a8938a" inherit meta-virt-depreciated-warning -S = "${WORKDIR}/git" - do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/recipes-devtools/go/go-patricia_git.bb b/recipes-devtools/go/go-patricia_git.bb index c05da591..4880c509 100644 --- a/recipes-devtools/go/go-patricia_git.bb +++ b/recipes-devtools/go/go-patricia_git.bb @@ -12,8 +12,6 @@ SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "666120de432aea38ab06bd5c818f04f4129882c9" PV = "2.2.6+git" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning do_install() { diff --git a/recipes-devtools/go/go-pty_git.bb b/recipes-devtools/go/go-pty_git.bb index d6aa95f6..f6e253a6 100644 --- a/recipes-devtools/go/go-pty_git.bb +++ b/recipes-devtools/go/go-pty_git.bb @@ -11,8 +11,6 @@ SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "05017fcccf23c823bfdea560dcc958a136e54fb7" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning do_install() { diff --git a/recipes-devtools/go/go-systemd_git.bb b/recipes-devtools/go/go-systemd_git.bb index e7e97b9e..d147889c 100644 --- a/recipes-devtools/go/go-systemd_git.bb +++ b/recipes-devtools/go/go-systemd_git.bb @@ -14,8 +14,6 @@ PV = "4+git" RDEPENDS:${PN} += "bash" -S = "${WORKDIR}/git" - inherit meta-virt-depreciated-warning do_install() { diff --git a/recipes-devtools/go/grpc-go_git.bb b/recipes-devtools/go/grpc-go_git.bb index 7989c02f..839a4f9c 100644 --- a/recipes-devtools/go/grpc-go_git.bb +++ b/recipes-devtools/go/grpc-go_git.bb @@ -7,13 +7,11 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=3b83ef96387f14655fc854ddc SRCNAME = "grpc-go" PKG_NAME = "google.golang.org/grpc" -SRC_URI = "git://github.com/grpc/${SRCNAME}.git;destsuffix=git/src/${PKG_NAME};branch=v1.59.x;protocol=https" +SRC_URI = "git://github.com/grpc/${SRCNAME}.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/${PKG_NAME};branch=v1.59.x;protocol=https" SRCREV = "7765221f4bf6104973db7946d56936cf838cad46" PV = "1.59.0+git" -S = "${WORKDIR}/git" - # NO-OP the do compile rule because this recipe is source only. do_compile() { } -- cgit v1.2.3-54-g00ecf