4 files changed, 3 insertions, 44 deletions

diff --git a/recipes-devtools/go/go-build_git.bb b/recipes-devtools/go/go-build_git.bb
index 75ea40a8..c0253298 100644
--- a/recipes-devtools/go/go-build_git.bb
+++ b/recipes-devtools/go/go-build_git.bb
@@ -7,7 +7,7 @@ SRCREV_runc = "1e7bb5b773162b57333d57f612fd72e3f8612d94"
 
 SRCREV_FORMAT = "runx_runc"
 SRC_URI = "\
-          git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \
+          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 \
           file://0001-build-use-instead-of-go.patch \
           "
diff --git a/recipes-devtools/go/go-cli_git.bb b/recipes-devtools/go/go-cli_git.bb
index 8a4992bd..37f65c33 100644
--- a/recipes-devtools/go/go-cli_git.bb
+++ b/recipes-devtools/go/go-cli_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ed9b539ed65d73926f30ff1f1587dc44"
 SRCNAME = "cli"
 
 PKG_NAME = "github.com/codegangsta/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https"
+SRC_URI = "git://${PKG_NAME}.git;branch=main;protocol=https"
 
 SRCREV = "27ecc97192df1bf053a22b04463f2b51b8b8373e"
 PV = "1.1.0+git"
diff --git a/recipes-devtools/go/go-md2man_git.bb b/recipes-devtools/go/go-md2man_git.bb
index 1d96bb1b..73d8d167 100644
--- a/recipes-devtools/go/go-md2man_git.bb
+++ b/recipes-devtools/go/go-md2man_git.bb
@@ -9,7 +9,7 @@ BBCLASSEXTEND = "native"
 GO_IMPORT = "github.com/cpuguy83/go-md2man"
 #GO_INSTALL = "${GO_IMPORT}/bin/go-md2man"
 
-SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https"
+SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}"
 
 SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a"
 PV = "1.0.10+git"
diff --git a/recipes-devtools/go/notary_git.bb b/recipes-devtools/go/notary_git.bb
deleted file mode 100644
index ace7174d..00000000
--- a/recipes-devtools/go/notary_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Notary is a Docker project that allows anyone to have trust over arbitrary collections of data"
-HOMEPAGE = "https://github.com/docker/notary"
-SECTION = "devel/go"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=3596b980bb036e0875174ed15e4b982a"
-
-SRCNAME = "notary"
-
-PKG_NAME = "github.com/docker/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
-
-SRCREV = "d6e1431feb32348e0650bf7551ac5cffd01d857b"
-PV = "0.6.1+git"
-
-S = "${WORKDIR}/git"
-
-inherit meta-virt-depreciated-warning
-
-# NO-OP the do compile rule because this recipe is source only.
-do_compile() {
-}
-
-do_install() {
-        install -d ${D}${prefix}/local/go/src/${PKG_NAME}
-        for j in $(cd ${S} && find src/${PKG_NAME} -name "*.go"); do
-            if [ ! -d ${D}${prefix}/local/go/$(dirname $j) ]; then
-                mkdir -p ${D}${prefix}/local/go/$(dirname $j)
-            fi
-            cp $j ${D}${prefix}/local/go/$j
-        done
-        cp -r ${S}/src/${PKG_NAME}/LICENSE ${D}${prefix}/local/go/src/${PKG_NAME}/
-}
-
-SYSROOT_PREPROCESS_FUNCS += "go_notary_sysroot_preprocess"
-
-go_notary_sysroot_preprocess () {
-    install -d ${SYSROOT_DESTDIR}${prefix}/local/go/src/${PKG_NAME}
-    cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
-}
-
-FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"