summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2025-06-25 22:40:08 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2025-06-25 22:55:55 -0400
commitbe0039855faef0f996966f3bc195ea418f2a40ab (patch)
tree45046c0a177a6c8d01412483e53cce0238235ae1
parentda1a1070814d2f6c178a4574687962446fc5be10 (diff)
downloadmeta-virtualization-be0039855faef0f996966f3bc195ea418f2a40ab.tar.gz
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 <bruce.ashfield@gmail.com>
Diffstat
-rw-r--r--recipes-devtools/go/compose-file_git.bb4
-rw-r--r--recipes-devtools/go/go-build_git.bb3
-rw-r--r--recipes-devtools/go/go-capability_git.bb2
-rw-r--r--recipes-devtools/go/go-cli_git.bb2
-rw-r--r--recipes-devtools/go/go-connections_git.bb4
-rw-r--r--recipes-devtools/go/go-context_git.bb2
-rw-r--r--recipes-devtools/go/go-dbus_git.bb2
-rw-r--r--recipes-devtools/go/go-distribution_git.bb4
-rw-r--r--recipes-devtools/go/go-fsnotify_git.bb2
-rw-r--r--recipes-devtools/go/go-libtrust_git.bb2
-rw-r--r--recipes-devtools/go/go-logrus_git.bb2
-rw-r--r--recipes-devtools/go/go-md2man_git.bb2
-rw-r--r--recipes-devtools/go/go-metalinter_git.bb2
-rw-r--r--recipes-devtools/go/go-mux_git.bb2
-rw-r--r--recipes-devtools/go/go-patricia_git.bb2
-rw-r--r--recipes-devtools/go/go-pty_git.bb2
-rw-r--r--recipes-devtools/go/go-systemd_git.bb2
-rw-r--r--recipes-devtools/go/grpc-go_git.bb4
-rw-r--r--recipes-devtools/python/python3-udica_git.bb2
19 files changed, 5 insertions, 42 deletions
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
7SRCNAME = "compose-file" 7SRCNAME = "compose-file"
8 8
9PKG_NAME = "github.com/aanand/${SRCNAME}" 9PKG_NAME = "github.com/aanand/${SRCNAME}"
10SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" 10SRC_URI = "git://${PKG_NAME}.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/${PKG_NAME};branch=master;protocol=https"
11 11
12SRCREV = "a3e58764f50597b6217fec07e9bff7225c4a1719" 12SRCREV = "a3e58764f50597b6217fec07e9bff7225c4a1719"
13PV = "3.0+git" 13PV = "3.0+git"
14 14
15S = "${WORKDIR}/git"
16
17# NO-OP the do compile rule because this recipe is source only. 15# NO-OP the do compile rule because this recipe is source only.
18do_compile() { 16do_compile() {
19} 17}
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"
8SRCREV_FORMAT = "runx_runc" 8SRCREV_FORMAT = "runx_runc"
9SRC_URI = "\ 9SRC_URI = "\
10 git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ 10 git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
11 git://github.com/opencontainers/runc;branch=release-1.1;name=runc;protocol=https;destsuffix=git/src/import/gobuild/go/src/github.com/opencontainers/runc \ 11 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 \
12 file://0001-build-use-instead-of-go.patch \ 12 file://0001-build-use-instead-of-go.patch \
13 " 13 "
14SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b" 14SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b"
@@ -17,7 +17,6 @@ SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986c
17LICENSE = "Apache-2.0" 17LICENSE = "Apache-2.0"
18LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=945fc9aa694796a6337395cc291ddd8c" 18LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=945fc9aa694796a6337395cc291ddd8c"
19 19
20S = "${WORKDIR}/git"
21PV = "0.1-git${SRCREV_runx}" 20PV = "0.1-git${SRCREV_runx}"
22 21
23inherit features_check 22inherit 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"
14 14
15inherit meta-virt-depreciated-warning 15inherit meta-virt-depreciated-warning
16 16
17S = "${WORKDIR}/git"
18
19do_install() { 17do_install() {
20 install -d ${D}${prefix}/local/go/src/${PKG_NAME} 18 install -d ${D}${prefix}/local/go/src/${PKG_NAME}
21 cp -r ${S}/* ${D}${prefix}/local/go/src/${PKG_NAME}/ 19 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"
12SRCREV = "27ecc97192df1bf053a22b04463f2b51b8b8373e" 12SRCREV = "27ecc97192df1bf053a22b04463f2b51b8b8373e"
13PV = "1.1.0+git" 13PV = "1.1.0+git"
14 14
15S = "${WORKDIR}/git"
16
17inherit meta-virt-depreciated-warning 15inherit meta-virt-depreciated-warning
18 16
19do_install() { 17do_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
7SRCNAME = "go-connections" 7SRCNAME = "go-connections"
8 8
9PKG_NAME = "github.com/docker/${SRCNAME}" 9PKG_NAME = "github.com/docker/${SRCNAME}"
10SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" 10SRC_URI = "git://${PKG_NAME}.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/${PKG_NAME};branch=master;protocol=https"
11 11
12SRCREV = "4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366" 12SRCREV = "4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366"
13PV = "0.2.1+git" 13PV = "0.2.1+git"
14 14
15S = "${WORKDIR}/git"
16
17inherit meta-virt-depreciated-warning 15inherit meta-virt-depreciated-warning
18 16
19# NO-OP the do compile rule because this recipe is source only. 17# 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"
11 11
12SRCREV = "1cbd4c16de64273a6e63fc710b0d89bfad72cd32" 12SRCREV = "1cbd4c16de64273a6e63fc710b0d89bfad72cd32"
13 13
14S = "${WORKDIR}/git"
15
16inherit meta-virt-depreciated-warning 14inherit meta-virt-depreciated-warning
17 15
18do_compile() { 16do_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"
12SRCREV = "5f6efc7ef2759c81b7ba876593971bfce311eab3" 12SRCREV = "5f6efc7ef2759c81b7ba876593971bfce311eab3"
13PV = "4.0.0+git" 13PV = "4.0.0+git"
14 14
15S = "${WORKDIR}/git"
16
17inherit meta-virt-depreciated-warning 15inherit meta-virt-depreciated-warning
18 16
19do_install() { 17do_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
7SRCNAME = "distribution" 7SRCNAME = "distribution"
8 8
9PKG_NAME = "github.com/docker/${SRCNAME}" 9PKG_NAME = "github.com/docker/${SRCNAME}"
10SRC_URI = "git://${PKG_NAME}.git;branch=docker/1.13;destsuffix=git/src/${PKG_NAME};protocol=https" 10SRC_URI = "git://${PKG_NAME}.git;branch=docker/1.13;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/${PKG_NAME};protocol=https"
11 11
12SRCREV = "28602af35aceda2f8d571bad7ca37a54cf0250bc" 12SRCREV = "28602af35aceda2f8d571bad7ca37a54cf0250bc"
13PV = "2.6.0+git" 13PV = "2.6.0+git"
14 14
15S = "${WORKDIR}/git"
16
17inherit meta-virt-depreciated-warning 15inherit meta-virt-depreciated-warning
18 16
19# NO-OP the do compile rule because this recipe is source only. 17# 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"
12SRCREV = "af855d7e6014ec848882bb2ed7d40d536872d275" 12SRCREV = "af855d7e6014ec848882bb2ed7d40d536872d275"
13PV = "v1.5.1+git" 13PV = "v1.5.1+git"
14 14
15S = "${WORKDIR}/git"
16
17inherit meta-virt-depreciated-warning 15inherit meta-virt-depreciated-warning
18 16
19do_install() { 17do_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"
12SRCREV = "9cbd2a1374f46905c68a4eb3694a130610adc62a" 12SRCREV = "9cbd2a1374f46905c68a4eb3694a130610adc62a"
13PV = "0.0+git" 13PV = "0.0+git"
14 14
15S = "${WORKDIR}/git"
16
17inherit meta-virt-depreciated-warning 15inherit meta-virt-depreciated-warning
18 16
19do_install() { 17do_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"
12SRCREV = "d26492970760ca5d33129d2d799e34be5c4782eb" 12SRCREV = "d26492970760ca5d33129d2d799e34be5c4782eb"
13PV = "0.11.0+git" 13PV = "0.11.0+git"
14 14
15S = "${WORKDIR}/git"
16
17inherit meta-virt-depreciated-warning 15inherit meta-virt-depreciated-warning
18 16
19do_install() { 17do_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
14SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a" 14SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a"
15PV = "1.0.10+git" 15PV = "1.0.10+git"
16 16
17S = "${WORKDIR}/git"
18
19inherit go 17inherit go
20 18
21do_compile:prepend() { 19do_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"
14SRCREV = "e8d801238da6f0dfd14078d68f9b53fa50a7eeb5" 14SRCREV = "e8d801238da6f0dfd14078d68f9b53fa50a7eeb5"
15PV = "0.0+git" 15PV = "0.0+git"
16 16
17S = "${WORKDIR}/git"
18
19do_install() { 17do_install() {
20 install -d ${D}${prefix}/local/go/src/${PKG_NAME} 18 install -d ${D}${prefix}/local/go/src/${PKG_NAME}
21 cp -r ${S}/* ${D}${prefix}/local/go/src/${PKG_NAME}/ 19 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"
13 13
14inherit meta-virt-depreciated-warning 14inherit meta-virt-depreciated-warning
15 15
16S = "${WORKDIR}/git"
17
18do_configure[noexec] = "1" 16do_configure[noexec] = "1"
19do_compile[noexec] = "1" 17do_compile[noexec] = "1"
20 18
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"
12SRCREV = "666120de432aea38ab06bd5c818f04f4129882c9" 12SRCREV = "666120de432aea38ab06bd5c818f04f4129882c9"
13PV = "2.2.6+git" 13PV = "2.2.6+git"
14 14
15S = "${WORKDIR}/git"
16
17inherit meta-virt-depreciated-warning 15inherit meta-virt-depreciated-warning
18 16
19do_install() { 17do_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"
11 11
12SRCREV = "05017fcccf23c823bfdea560dcc958a136e54fb7" 12SRCREV = "05017fcccf23c823bfdea560dcc958a136e54fb7"
13 13
14S = "${WORKDIR}/git"
15
16inherit meta-virt-depreciated-warning 14inherit meta-virt-depreciated-warning
17 15
18do_install() { 16do_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"
14 14
15RDEPENDS:${PN} += "bash" 15RDEPENDS:${PN} += "bash"
16 16
17S = "${WORKDIR}/git"
18
19inherit meta-virt-depreciated-warning 17inherit meta-virt-depreciated-warning
20 18
21do_install() { 19do_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
7SRCNAME = "grpc-go" 7SRCNAME = "grpc-go"
8 8
9PKG_NAME = "google.golang.org/grpc" 9PKG_NAME = "google.golang.org/grpc"
10SRC_URI = "git://github.com/grpc/${SRCNAME}.git;destsuffix=git/src/${PKG_NAME};branch=v1.59.x;protocol=https" 10SRC_URI = "git://github.com/grpc/${SRCNAME}.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/${PKG_NAME};branch=v1.59.x;protocol=https"
11 11
12SRCREV = "7765221f4bf6104973db7946d56936cf838cad46" 12SRCREV = "7765221f4bf6104973db7946d56936cf838cad46"
13PV = "1.59.0+git" 13PV = "1.59.0+git"
14 14
15S = "${WORKDIR}/git"
16
17# NO-OP the do compile rule because this recipe is source only. 15# NO-OP the do compile rule because this recipe is source only.
18do_compile() { 16do_compile() {
19} 17}
diff --git a/recipes-devtools/python/python3-udica_git.bb b/recipes-devtools/python/python3-udica_git.bb
index 1d239cba..004c788c 100644
--- a/recipes-devtools/python/python3-udica_git.bb
+++ b/recipes-devtools/python/python3-udica_git.bb
@@ -8,8 +8,6 @@ SRC_URI = "git://github.com/containers/udica;protocol=https;branch=main"
8SRCREV = "4a64ff7c1b8116a1894e72eee2a19706e970001f" 8SRCREV = "4a64ff7c1b8116a1894e72eee2a19706e970001f"
9PV = "0.2.7+git" 9PV = "0.2.7+git"
10 10
11S = "${WORKDIR}/git"
12
13SRC_URI[md5sum] = "9cc5156a2ff6458a8f52114b9bbc0d7e" 11SRC_URI[md5sum] = "9cc5156a2ff6458a8f52114b9bbc0d7e"
14SRC_URI[sha256sum] = "3e8bc47534e0ca9331d72c32f2881bb13b93ded0bcdeab3c833fb7cf61c0a9a5" 12SRC_URI[sha256sum] = "3e8bc47534e0ca9331d72c32f2881bb13b93ded0bcdeab3c833fb7cf61c0a9a5"
15 13
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-11 08:25:30 +0000