recipes/classes/scripts: Drop SRCPV usage

bitbake has been enhanced such that SRCPV is no longer needed in
PV to handle updating git hashes and task signatures.

We can simplify our PV by dropping SRCPV

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

61 files changed, 61 insertions, 61 deletions

diff --git a/recipes-containers/conmon/conmon_git.bb b/recipes-containers/conmon/conmon_git.bb
index 8486d6ad..efef7f9a 100644
--- a/recipes-containers/conmon/conmon_git.bb
+++ b/recipes-containers/conmon/conmon_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "\
     git://github.com/containers/conmon.git;branch=main;protocol=https \
 "
 
-PV = "2.1.7+git${SRCPV}"
+PV = "2.1.7+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index 28613f86..076afac1 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -25,7 +25,7 @@ RPROVIDES:${PN} = "virtual-containerd"
 
 S = "${WORKDIR}/git/src/github.com/containerd/containerd"
 
-PV = "${CONTAINERD_VERSION}+git${SRCPV}"
+PV = "${CONTAINERD_VERSION}+git"
 
 inherit go
 inherit goarch
diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
index 3d25aa27..bda0aa2a 100644
--- a/recipes-containers/criu/criu_git.bb
+++ b/recipes-containers/criu/criu_git.bb
@@ -14,7 +14,7 @@ EXCLUDE_FROM_WORLD = "1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2"
 
 SRCREV = "d46f40f4ff0c724e0b9f0f8a2e8c043806897e94"
-PV = "3.17.1+git${SRCPV}"
+PV = "3.17.1+git"
 
 SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=https \
            file://0001-criu-Skip-documentation-install.patch \
diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
index 431a9fb2..45eda5cb 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -11,7 +11,7 @@ SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.8;name=dist
 
 PACKAGES =+ "docker-registry"
 
-PV = "v2.8.2+git${SRCPV}"
+PV = "v2.8.2+git"
 S = "${WORKDIR}/git/src/github.com/docker/distribution"
 
 GO_IMPORT = "import"
diff --git a/recipes-containers/go-digest/go-digest_git.bb b/recipes-containers/go-digest/go-digest_git.bb
index 7d8070e6..a231cf7b 100644
--- a/recipes-containers/go-digest/go-digest_git.bb
+++ b/recipes-containers/go-digest/go-digest_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/opencontainers/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 SRCREV = "65fac7b55eb714642e9359458656939349dcb766"
-PV = "v1.0.0-rc0+git${SRCPV}"
+PV = "v1.0.0-rc0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-containers/go-errors/go-errors_git.bb b/recipes-containers/go-errors/go-errors_git.bb
index 678b0242..87486358 100644
--- a/recipes-containers/go-errors/go-errors_git.bb
+++ b/recipes-containers/go-errors/go-errors_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/pkg/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 SRCREV = "5dd12d0cfe7f152f80558d591504ce685299311e"
-PV = "v0.8.1+git${SRCPV}"
+PV = "v0.8.1+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb b/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb
index e5c442f4..c6629014 100644
--- a/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb
+++ b/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/spf13/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
 
 SRCREV = "4dd4b25de38418174a6e859e8a32eaccca32dccc"
-PV = "v1.6.0+git${SRCPV}"
+PV = "v1.6.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb b/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb
index 5d66de3a..201f183a 100644
--- a/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb
+++ b/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/spf13/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 SRCREV = "d5e0c0615acee7028e1e2740a11102313be88de1"
-PV = "v1.0.5+git${SRCPV}"
+PV = "v1.0.5+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index e6c7aed7..c6d8c430 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -19,7 +19,7 @@ SRC_URI:class-devupstream = "git://github.com/kubernetes/kubernetes.git;branch=m
                             "
 SRCREV_kubernetes:class-devupstream = "d2f6eb6339de25cef04850b6d9be8335d52324cd"
 SRCREV_kubernetes-release:class-devupstream = "7c1aa83dac555de6f05500911467b70aca4949f0"
-PV:class-devupstream = "v1.23-alpha+git${SRCPV}"
+PV:class-devupstream = "v1.23-alpha+git"
 
 SRCREV_FORMAT ?= "kubernetes_release"
 
diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
index 53321230..94e71087 100644
--- a/recipes-containers/lxc/lxc_git.bb
+++ b/recipes-containers/lxc/lxc_git.bb
@@ -50,7 +50,7 @@ SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-5.0;protocol=https \
         "
 
 SRCREV = "cb8e38aca27a23964941f0f011a8919aab8bebab"
-PV = "5.0.3+git${SRCPV}"
+PV = "5.0.3+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-containers/oci-image-spec/oci-image-spec_git.bb b/recipes-containers/oci-image-spec/oci-image-spec_git.bb
index 1d7cf0c8..e5422cec 100644
--- a/recipes-containers/oci-image-spec/oci-image-spec_git.bb
+++ b/recipes-containers/oci-image-spec/oci-image-spec_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/opencontainers/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
 
 SRCREV = "9615142d016838b5dfe7453f80af0be74feb5c7c"
-PV = "v1.1.0-rc3+git${SRCPV}"
+PV = "v1.1.0-rc3+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
index 4beb3a63..878d4cc7 100644
--- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb
+++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/opencontainers/image-tools.git;branch=master;protoco
            file://0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch"
 
 SRCREV = "11f9988298305d36f64248a6ee55318e60bf170b"
-PV = "1.0.0-rc3+git${SRCPV}"
+PV = "1.0.0-rc3+git"
 GO_IMPORT = "import"
 
 inherit goarch
diff --git a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
index f830bf03..6eccb148 100644
--- a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
+++ b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/opencontainers/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
 
 SRCREV = "720792f25ae6e9ee6b1332db698f37659e69ce8d"
-PV = "v1.1.0-rc2+git${SRCPV}"
+PV = "v1.1.0-rc2+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
index 8eb272ae..81bebfe2 100644
--- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
+++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/opencontainers/runtime-tools.git;branch=master;proto
            "
 
 SRCREV = "0105384f68e16803891d0a17d9067b1def6a2778"
-PV = "0.9.0+git${SRCPV}"
+PV = "0.9.0+git"
 GO_IMPORT = "import"
 
 INSANE_SKIP:${PN} += "ldflags textrel"
diff --git a/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb b/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb
index 4f23dc49..0d5ce5f5 100644
--- a/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb
+++ b/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/projectatomic/oci-systemd-hook;branch=master;protoco
            file://0001-Add-additional-cgroup-mounts-from-root-NS-automatica.patch \
 "
 
-PV = "0.2.0+git${SRCPV}"
+PV = "0.2.0+git"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
diff --git a/recipes-containers/podman-tui/podman-tui_git.bb b/recipes-containers/podman-tui/podman-tui_git.bb
index c546e132..1a40d0ec 100644
--- a/recipes-containers/podman-tui/podman-tui_git.bb
+++ b/recipes-containers/podman-tui/podman-tui_git.bb
@@ -34,7 +34,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-PV = "v0.9.1+git${SRCPV}"
+PV = "v0.9.1+git"
 
 PODMAN_PKG = "github.com/containers/podman-tui"
 
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 53906e13..12274fee 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -32,7 +32,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-PV = "4.6.0+git${SRCPV}"
+PV = "4.6.0+git"
 
 CVE_STATUS[CVE-2022-2989] = "fixed-version: fixed since v4.3.0"
 CVE_STATUS[CVE-2023-0778] = "fixed-version: fixed since v4.5.0"
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb
index f172f5bd..2b2902b5 100644
--- a/recipes-containers/riddler/riddler_git.bb
+++ b/recipes-containers/riddler/riddler_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/jfrazelle/riddler;branch=master;protocol=https;dests
           "
 
 SRCREV = "23befa0b232877b5b502b828e24161d801bd67f6"
-PV = "0.1.0+git${SRCPV}"
+PV = "0.1.0+git"
 
 S = "${WORKDIR}/git/src/github.com/jessfraz/riddler"
 GO_IMPORT = "github.com/jessfraz/riddler"
diff --git a/recipes-containers/singularity/singularity_git.bb b/recipes-containers/singularity/singularity_git.bb
index e3903ecc..72171b39 100644
--- a/recipes-containers/singularity/singularity_git.bb
+++ b/recipes-containers/singularity/singularity_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/singularityware/singularity.git;protocol=https;branc
     file://0001-Use-python3.patch \
     file://0001-configure.ac-drop-2nd-AM_INIT_AUTOMAKE.patch \
 "
-PV = "2.3.1+git${SRCPV}"
+PV = "2.3.1+git"
 SRCREV = "e214d4ebf0a1274b1c63b095fd55ae61c7e92947"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index 48f22a24..c29009a1 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_git.bb
@@ -25,7 +25,7 @@ SRC_URI = " \
 "
 
 SRCREV = "416218f501364aa05fbe63617fd4599d63d82637"
-PV = "v1.13.1+git${SRCPV}"
+PV = "v1.13.1+git"
 GO_IMPORT = "import"
 
 S = "${WORKDIR}/git/src/github.com/containers/skopeo"
diff --git a/recipes-containers/sloci-image/sloci-image_git.bb b/recipes-containers/sloci-image/sloci-image_git.bb
index 37f91045..4bbf06e2 100644
--- a/recipes-containers/sloci-image/sloci-image_git.bb
+++ b/recipes-containers/sloci-image/sloci-image_git.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/jirutka/sloci-image.git;branch=master;protocol=https
 DEPENDS = ""
 
 SRCREV = "4015e49763e5a738026a5bbfcf32b38b5a4fa650"
-PV = "v0.1.0+git${SRCPV}"
+PV = "v0.1.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-containers/umoci/umoci_git.bb b/recipes-containers/umoci/umoci_git.bb
index 024cf505..feaf6dff 100644
--- a/recipes-containers/umoci/umoci_git.bb
+++ b/recipes-containers/umoci/umoci_git.bb
@@ -10,7 +10,7 @@ SRCREV_umoci = "33ec00665c66321f1b1f34ca7e6f370ac35c1233"
 SRC_URI = "git://github.com/opencontainers/umoci.git;branch=main;name=umoci;destsuffix=github.com/opencontainers/umoci;protocol=https \
           "
 
-PV = "v0.4.7+git${SRCPV}"
+PV = "v0.4.7+git"
 S = "${WORKDIR}/github.com/opencontainers/umoci"
 GO_IMPORT = "github.com/opencontainers/umoci"
 
diff --git a/recipes-devtools/go/compose-file_git.bb b/recipes-devtools/go/compose-file_git.bb
index c33a7ac7..7fedc407 100644
--- a/recipes-devtools/go/compose-file_git.bb
+++ b/recipes-devtools/go/compose-file_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/aanand/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 SRCREV = "a3e58764f50597b6217fec07e9bff7225c4a1719"
-PV = "3.0+git${SRCPV}"
+PV = "3.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-capability_git.bb b/recipes-devtools/go/go-capability_git.bb
index 7e5ab115..e01a83d1 100644
--- a/recipes-devtools/go/go-capability_git.bb
+++ b/recipes-devtools/go/go-capability_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/syndtr/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https"
 
 SRCREV = "2c00daeb6c3b45114c80ac44119e7b8801fdd852"
-PV = "0.0+git${SRCPV}"
+PV = "0.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-cli_git.bb b/recipes-devtools/go/go-cli_git.bb
index ae67f8e0..affe38ec 100644
--- a/recipes-devtools/go/go-cli_git.bb
+++ b/recipes-devtools/go/go-cli_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/codegangsta/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https"
 
 SRCREV = "27ecc97192df1bf053a22b04463f2b51b8b8373e"
-PV = "1.1.0+git${SRCPV}"
+PV = "1.1.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-connections_git.bb b/recipes-devtools/go/go-connections_git.bb
index ebfdb9f1..7e8f020d 100644
--- a/recipes-devtools/go/go-connections_git.bb
+++ b/recipes-devtools/go/go-connections_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/docker/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 SRCREV = "4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366"
-PV = "0.2.1+git${SRCPV}"
+PV = "0.2.1+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-dbus_git.bb b/recipes-devtools/go/go-dbus_git.bb
index 4bf44d63..49b2de3b 100644
--- a/recipes-devtools/go/go-dbus_git.bb
+++ b/recipes-devtools/go/go-dbus_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/godbus/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https"
 
 SRCREV = "5f6efc7ef2759c81b7ba876593971bfce311eab3"
-PV = "4.0.0+git${SRCPV}"
+PV = "4.0.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-distribution_git.bb b/recipes-devtools/go/go-distribution_git.bb
index 948831b1..dd98a317 100644
--- a/recipes-devtools/go/go-distribution_git.bb
+++ b/recipes-devtools/go/go-distribution_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/docker/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;branch=docker/1.13;destsuffix=git/src/${PKG_NAME};protocol=https"
 
 SRCREV = "28602af35aceda2f8d571bad7ca37a54cf0250bc"
-PV = "2.6.0+git${SRCPV}"
+PV = "2.6.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-fsnotify_git.bb b/recipes-devtools/go/go-fsnotify_git.bb
index e6545186..052658b8 100644
--- a/recipes-devtools/go/go-fsnotify_git.bb
+++ b/recipes-devtools/go/go-fsnotify_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/fsnotify/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;branch=main;protocol=https"
 
 SRCREV = "af855d7e6014ec848882bb2ed7d40d536872d275"
-PV = "v1.5.1+git${SRCPV}"
+PV = "v1.5.1+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-libtrust_git.bb b/recipes-devtools/go/go-libtrust_git.bb
index e2a28ec9..c578008a 100644
--- a/recipes-devtools/go/go-libtrust_git.bb
+++ b/recipes-devtools/go/go-libtrust_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/docker/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https"
 
 SRCREV = "9cbd2a1374f46905c68a4eb3694a130610adc62a"
-PV = "0.0+git${SRCPV}"
+PV = "0.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-logrus_git.bb b/recipes-devtools/go/go-logrus_git.bb
index cb137707..211d07c9 100644
--- a/recipes-devtools/go/go-logrus_git.bb
+++ b/recipes-devtools/go/go-logrus_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/sirupsen/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME};branch=master;protocol=https"
 
 SRCREV = "d26492970760ca5d33129d2d799e34be5c4782eb"
-PV = "0.11.0+git${SRCPV}"
+PV = "0.11.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-md2man_git.bb b/recipes-devtools/go/go-md2man_git.bb
index aa058990..1d96bb1b 100644
--- a/recipes-devtools/go/go-md2man_git.bb
+++ b/recipes-devtools/go/go-md2man_git.bb
@@ -12,7 +12,7 @@ GO_IMPORT = "github.com/cpuguy83/go-md2man"
 SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https"
 
 SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a"
-PV = "1.0.10+git${SRCPV}"
+PV = "1.0.10+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-metalinter_git.bb b/recipes-devtools/go/go-metalinter_git.bb
index 3dda45cc..def3d063 100644
--- a/recipes-devtools/go/go-metalinter_git.bb
+++ b/recipes-devtools/go/go-metalinter_git.bb
@@ -12,7 +12,7 @@ PKG_NAME = "github.com/alecthomas/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https"
 
 SRCREV = "e8d801238da6f0dfd14078d68f9b53fa50a7eeb5"
-PV = "0.0+git${SRCPV}"
+PV = "0.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-patricia_git.bb b/recipes-devtools/go/go-patricia_git.bb
index 4c29b57e..0a3c3f35 100644
--- a/recipes-devtools/go/go-patricia_git.bb
+++ b/recipes-devtools/go/go-patricia_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/tchap/${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https"
 
 SRCREV = "666120de432aea38ab06bd5c818f04f4129882c9"
-PV = "2.2.6+git${SRCPV}"
+PV = "2.2.6+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/go-systemd_git.bb b/recipes-devtools/go/go-systemd_git.bb
index 91f67da2..3aa837aa 100644
--- a/recipes-devtools/go/go-systemd_git.bb
+++ b/recipes-devtools/go/go-systemd_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "github.com/coreos/go-${SRCNAME}"
 SRC_URI = "git://${PKG_NAME}.git;branch=main;protocol=https"
 
 SRCREV = "b4a58d95188dd092ae20072bac14cece0e67c388"
-PV = "4+git${SRCPV}"
+PV = "4+git"
 
 RDEPENDS:${PN} += "bash"
 
diff --git a/recipes-devtools/go/grpc-go_git.bb b/recipes-devtools/go/grpc-go_git.bb
index b516e216..d5bfaab9 100644
--- a/recipes-devtools/go/grpc-go_git.bb
+++ b/recipes-devtools/go/grpc-go_git.bb
@@ -10,7 +10,7 @@ PKG_NAME = "google.golang.org/grpc"
 SRC_URI = "git://github.com/grpc/${SRCNAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 SRCREV = "5d8e5aad40bedb696205b96b786f1d0e1326b3f8"
-PV = "1.41.0+git${SRCPV}"
+PV = "1.41.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/go/notary_git.bb b/recipes-devtools/go/notary_git.bb
index 972da5ee..1b877d62 100644
--- a/recipes-devtools/go/notary_git.bb
+++ b/recipes-devtools/go/notary_git.bb
@@ -10,7 +10,7 @@ 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${SRCPV}"
+PV = "0.6.1+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-devtools/python/python3-udica_git.bb b/recipes-devtools/python/python3-udica_git.bb
index 93f6bdc3..1d239cba 100644
--- a/recipes-devtools/python/python3-udica_git.bb
+++ b/recipes-devtools/python/python3-udica_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
 SRC_URI = "git://github.com/containers/udica;protocol=https;branch=main"
 
 SRCREV = "4a64ff7c1b8116a1894e72eee2a19706e970001f"
-PV = "0.2.7+git${SRCPV}"
+PV = "0.2.7+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/cloud-init/cloud-init_git.bb b/recipes-extended/cloud-init/cloud-init_git.bb
index e01bdad2..b5c2d711 100644
--- a/recipes-extended/cloud-init/cloud-init_git.bb
+++ b/recipes-extended/cloud-init/cloud-init_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/canonical/cloud-init;branch=23.2.x;protocol=https \
     file://0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patch \
 "
 
-PV = "v23.2.2+git${SRCPV}"
+PV = "v23.2.2+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/dev86/dev86_git.bb b/recipes-extended/dev86/dev86_git.bb
index 82f43a08..a3d0fded 100644
--- a/recipes-extended/dev86/dev86_git.bb
+++ b/recipes-extended/dev86/dev86_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 SECTION = "console/tools"
 
 BASE_PV="0.16.21"
-PV = "${BASE_PV}+git${SRCPV}"
+PV = "${BASE_PV}+git"
 SRCREV = "e254e0b19651d3b8a20225b40281c9974a95dec4"
 SRC_URI = "git://github.com/jbruchon/${BPN}.git;protocol=https;branch=master \
     file://0001-cpp-Makefile-respect-LDFLAGS-when-building-bcc-cpp.patch \
diff --git a/recipes-extended/diod/diod_1.0.24.bb b/recipes-extended/diod/diod_1.0.24.bb
index 7520e192..2b87a8ae 100644
--- a/recipes-extended/diod/diod_1.0.24.bb
+++ b/recipes-extended/diod/diod_1.0.24.bb
@@ -8,7 +8,7 @@ SECTION = "console/network"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-PV = "1.0.24+git${SRCPV}"
+PV = "1.0.24+git"
 SRCREV = "0ea3fe3d829b5085307cd27a512708d99ef48199"
 SRC_URI = "git://github.com/chaos/diod.git;protocol=https;branch=master \
            file://diod \
diff --git a/recipes-extended/hyperstart/hyperstart_git.bb b/recipes-extended/hyperstart/hyperstart_git.bb
index 435a521d..e156cdae 100644
--- a/recipes-extended/hyperstart/hyperstart_git.bb
+++ b/recipes-extended/hyperstart/hyperstart_git.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/hyperhq/hyperstart.git;branch=master;protocol=https"
 SRC_URI += "file://0001-container.c-Fix-compiler-errors-that-gcc-8.1.0-repor.patch"
 
 SRCREV = "c0c07d218b482dd07f9068b52a6e7468ae4172ac"
-PV = "v0.2+git${SRCPV}"
+PV = "v0.2+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/ipxe/ipxe_git.bb b/recipes-extended/ipxe/ipxe_git.bb
index 7565c219..08ed519a 100644
--- a/recipes-extended/ipxe/ipxe_git.bb
+++ b/recipes-extended/ipxe/ipxe_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://../COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263
 COMPATIBLE_HOST:class-target = '(x86_64|i.86).*-(linux|freebsd.*)'
 
 SRCREV = "18dc73d27edb55ebe9cb13c58d59af3da3bd374b"
-PV = "1.20.1+git${SRCPV}"
+PV = "1.20.1+git"
 PR = "r0"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
diff --git a/recipes-extended/irqbalance/irqbalance_git.bb b/recipes-extended/irqbalance/irqbalance_git.bb
index a944c2f1..aa7f0de9 100644
--- a/recipes-extended/irqbalance/irqbalance_git.bb
+++ b/recipes-extended/irqbalance/irqbalance_git.bb
@@ -5,7 +5,7 @@
 require irqbalance.inc
 
 SRCREV = "b3adb5fd1496833e4e2cebc958d3919178cd5e3d"
-PV = "1.8.0+git${SRCPV}"
+PV = "1.8.0+git"
 
 SRC_URI = "git://github.com/Irqbalance/irqbalance;branch=master;protocol=https \
            file://add-initscript.patch \
diff --git a/recipes-extended/kvmtool/kvmtool.bb b/recipes-extended/kvmtool/kvmtool.bb
index 79c4505a..53d8f9d2 100644
--- a/recipes-extended/kvmtool/kvmtool.bb
+++ b/recipes-extended/kvmtool/kvmtool.bb
@@ -17,7 +17,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git;branch
            "
 
 SRCREV = "336751fb10ef24e65cd2f25c450da1d52ff5b33c"
-PV = "5.10.0+git${SRCPV}"
+PV = "5.10.0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/libvmi/libvmi_git.bb b/recipes-extended/libvmi/libvmi_git.bb
index 25d7d407..aa7fabb6 100644
--- a/recipes-extended/libvmi/libvmi_git.bb
+++ b/recipes-extended/libvmi/libvmi_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/libvmi/libvmi"
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02"
 SECTION = "console/tools"
-PV = "0.14.0+git${SRCPV}"
+PV = "0.14.0+git"
 
 DEPENDS = "libvirt libcheck bison fuse bison-native flex-native autoconf-archive-native"
 
diff --git a/recipes-extended/upx/upx_git.bb b/recipes-extended/upx/upx_git.bb
index bb8004c6..2a5f08be 100644
--- a/recipes-extended/upx/upx_git.bb
+++ b/recipes-extended/upx/upx_git.bb
@@ -23,7 +23,7 @@ DEPENDS = "zlib libucl xz cmake-native"
 
 S = "${WORKDIR}/git"
 
-PV = "3.96+${SRCPV}"
+PV = "3.96+"
 
 EXTRA_OEMAKE += " \
     UPX_UCLDIR=${STAGING_DIR_TARGET} \
diff --git a/recipes-extended/virt-viewer/virt-viewer_11.0.bb b/recipes-extended/virt-viewer/virt-viewer_11.0.bb
index 76b6042f..273e1fc5 100644
--- a/recipes-extended/virt-viewer/virt-viewer_11.0.bb
+++ b/recipes-extended/virt-viewer/virt-viewer_11.0.bb
@@ -13,7 +13,7 @@ DEPENDS = " \
 SRC_URI = "git://gitlab.com/virt-viewer/virt-viewer.git;protocol=https;branch=master"
 
 SRCREV = "de864c14146c120b46d435949b1d8d0b11e57b85"
-PV = "11.0+git${SRCPV}"
+PV = "11.0+git"
 S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
diff --git a/recipes-extended/xen/xen-tools_4.16.bb b/recipes-extended/xen/xen-tools_4.16.bb
index 34790f70..20671af5 100644
--- a/recipes-extended/xen/xen-tools_4.16.bb
+++ b/recipes-extended/xen/xen-tools_4.16.bb
@@ -12,7 +12,7 @@ SRC_URI = " \
 
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
 
-PV = "${XEN_REL}+stable${SRCPV}"
+PV = "${XEN_REL}+stable"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/xen/xen-tools_4.17.bb b/recipes-extended/xen/xen-tools_4.17.bb
index b58d7594..83093425 100644
--- a/recipes-extended/xen/xen-tools_4.17.bb
+++ b/recipes-extended/xen/xen-tools_4.17.bb
@@ -12,7 +12,7 @@ SRC_URI = " \
 
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
 
-PV = "${XEN_REL}+stable${SRCPV}"
+PV = "${XEN_REL}+stable"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb
index a71157a4..8fbdf92e 100644
--- a/recipes-extended/xen/xen-tools_git.bb
+++ b/recipes-extended/xen/xen-tools_git.bb
@@ -11,7 +11,7 @@ SRC_URI = " \
 
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
 
-PV = "${XEN_REL}+git${SRCPV}"
+PV = "${XEN_REL}+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/xen/xen_4.16.bb b/recipes-extended/xen/xen_4.16.bb
index 77d09516..f4d922c5 100644
--- a/recipes-extended/xen/xen_4.16.bb
+++ b/recipes-extended/xen/xen_4.16.bb
@@ -11,7 +11,7 @@ SRC_URI = " \
 
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
 
-PV = "${XEN_REL}+stable${SRCPV}"
+PV = "${XEN_REL}+stable"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/xen/xen_4.17.bb b/recipes-extended/xen/xen_4.17.bb
index bd8f55b3..54da7baf 100644
--- a/recipes-extended/xen/xen_4.17.bb
+++ b/recipes-extended/xen/xen_4.17.bb
@@ -12,7 +12,7 @@ SRC_URI = " \
 
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
 
-PV = "${XEN_REL}+stable${SRCPV}"
+PV = "${XEN_REL}+stable"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
index 7ed89771..13eee6f7 100644
--- a/recipes-extended/xen/xen_git.bb
+++ b/recipes-extended/xen/xen_git.bb
@@ -11,7 +11,7 @@ SRC_URI = " \
 
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
 
-PV = "${XEN_REL}+git${SRCPV}"
+PV = "${XEN_REL}+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/xen/xtf_git.bb b/recipes-extended/xen/xtf_git.bb
index 59f1cad2..f1e76f7b 100644
--- a/recipes-extended/xen/xtf_git.bb
+++ b/recipes-extended/xen/xtf_git.bb
@@ -12,7 +12,7 @@ COMPATIBLE_HOST = '(x86_64.*).*-linux'
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=a5680865974e05cf0510615ee1d745d8"
 
-PV = "0+git${SRCPV}"
+PV = "0+git"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/xvisor/xvisor_git.bb b/recipes-extended/xvisor/xvisor_git.bb
index cb52566e..205951e9 100644
--- a/recipes-extended/xvisor/xvisor_git.bb
+++ b/recipes-extended/xvisor/xvisor_git.bb
@@ -8,7 +8,7 @@ require xvisor-configs.inc
 
 inherit autotools-brokensep
 
-PV = "0.3.0+git${SRCPV}"
+PV = "0.3.0+git"
 
 # This version support the RISC-V v0.5.0 Hypervisor extensions
 SRCREV = "6b23764a1439f9d08b2ed2f363da522460d8a22b"
diff --git a/recipes-kernel/lopper/lopper_git.bb b/recipes-kernel/lopper/lopper_git.bb
index dd887d09..5e2ca69a 100644
--- a/recipes-kernel/lopper/lopper_git.bb
+++ b/recipes-kernel/lopper/lopper_git.bb
@@ -8,7 +8,7 @@ SRCREV = "9159040dab25e2f1e7b447fcbfcd5397b1d618e8"
 S = "${WORKDIR}/git"
 
 BASEVERSION = "1.0.2"
-PV = "v${BASEVERSION}+git${SRCPV}"
+PV = "v${BASEVERSION}+git"
 
 PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${BPN}-${BASEVERSION}-*.whl"
 
diff --git a/recipes-networking/netns/netns_git.bb b/recipes-networking/netns/netns_git.bb
index 53d3ff53..357275c1 100644
--- a/recipes-networking/netns/netns_git.bb
+++ b/recipes-networking/netns/netns_git.bb
@@ -7,7 +7,7 @@ SRC_URI = "git://github.com/genuinetools/netns;branch=master;protocol=https \
            file://Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch \
           "
 SRCREV = "00d5d07ab1c8afcf481ffa5958719943b6ecfde4"
-PV = "0.5.3+git${SRCPV}"
+PV = "0.5.3+git"
 GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index 2e1a1a02..b57fa1ed 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -14,7 +14,7 @@ RDEPENDS:${PN}-ptest += "\
         "
 
 S = "${WORKDIR}/git"
-PV = "3.1.1+${SRCPV}"
+PV = "3.1.1+"
 CVE_VERSION = "3.1.1"
 
 FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:"
diff --git a/recipes-networking/slirp/libslirp-virt_git.bb b/recipes-networking/slirp/libslirp-virt_git.bb
index aeb61f63..9f6dc627 100644
--- a/recipes-networking/slirp/libslirp-virt_git.bb
+++ b/recipes-networking/slirp/libslirp-virt_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727"
 
 SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
 SRCREV = "888ddad6bde1dc6d7dbfc8daa7d015251b72e02c"
-PV = "4.6.1+git${SRCPV}"
+PV = "4.6.1+git"
 S = "${WORKDIR}/git"
 
 DEPENDS = " \
diff --git a/recipes-networking/slirp4netns/slirp4netns_git.bb b/recipes-networking/slirp4netns/slirp4netns_git.bb
index 6526d39c..33a5636a 100644
--- a/recipes-networking/slirp4netns/slirp4netns_git.bb
+++ b/recipes-networking/slirp4netns/slirp4netns_git.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1e2efd29c201480c6be2744d9edade26"
 SRCREV = "323aa69a68362a432f15d5e8050e74a0637aaf1e"
 SRC_URI = "git://github.com/rootless-containers/slirp4netns.git;nobranch=1;protocol=https"
 
-PV = "1.2.0+git${SRCPV}"
+PV = "1.2.0+git"
 
 inherit features_check
 REQUIRED_DISTRO_FEATURES ?= "seccomp"