mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
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>
This commit is contained in:
parent
da1a107081
commit
be0039855f
|
@ -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() {
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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}/
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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}/
|
||||
|
|
|
@ -13,8 +13,6 @@ SRCREV = "85123bf20e069b156415b871dea10517f6a8938a"
|
|||
|
||||
inherit meta-virt-depreciated-warning
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
do_configure[noexec] = "1"
|
||||
do_compile[noexec] = "1"
|
||||
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -14,8 +14,6 @@ PV = "4+git"
|
|||
|
||||
RDEPENDS:${PN} += "bash"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit meta-virt-depreciated-warning
|
||||
|
||||
do_install() {
|
||||
|
|
|
@ -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() {
|
||||
}
|
||||
|
|
|
@ -8,8 +8,6 @@ SRC_URI = "git://github.com/containers/udica;protocol=https;branch=main"
|
|||
SRCREV = "4a64ff7c1b8116a1894e72eee2a19706e970001f"
|
||||
PV = "0.2.7+git"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRC_URI[md5sum] = "9cc5156a2ff6458a8f52114b9bbc0d7e"
|
||||
SRC_URI[sha256sum] = "3e8bc47534e0ca9331d72c32f2881bb13b93ded0bcdeab3c833fb7cf61c0a9a5"
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user