diff options
Diffstat (limited to 'poky/meta-selftest/recipes-test')
5 files changed, 23 insertions, 19 deletions
diff --git a/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb b/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb index 203f4b61c2..2558a22ce5 100644 --- a/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb +++ b/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb @@ -8,7 +8,7 @@ DEPENDS = "dbus" # Note: this is intentionally not the latest version in the original .bb SRCREV = "1a3e1343761b30750bed70e0fd688f6d3c7b3717" -PV = "0.1+git${SRCPV}" +PV = "0.1+git" PR = "r2" SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master" diff --git a/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded b/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded index 3d45fc4857..eaa8bd898d 100644 --- a/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded +++ b/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded @@ -8,7 +8,7 @@ DEPENDS = "dbus" # Note: this is intentionally not the latest version in the original .bb SRCREV = "6cc6077a36fe2648a5f993fe7c16c9632f946517" -PV = "0.1+git${SRCPV}" +PV = "0.1+git" SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master" UPSTREAM_CHECK_COMMITS = "1" diff --git a/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline-fail.bb b/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline-fail.bb index 602e895199..5146129666 100644 --- a/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline-fail.bb +++ b/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline-fail.bb @@ -1,16 +1,4 @@ -SUMMARY = "Test recipe for fetching git submodules" -HOMEPAGE = "https://git.yoctoproject.org/git/matchbox-panel-2" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +require gitunpackoffline.inc -INHIBIT_DEFAULT_DEPS = "1" - -TAGVALUE = "2.10" - -# Deliberately have a tag which has to be resolved but ensure do_unpack doesn't access the network again. -SRC_URI = "git://git.yoctoproject.org/git/matchbox-panel-2;branch=master;protocol=https" -SRC_URI:append:gitunpack-enable-recipe = ";tag=${TAGVALUE}" -SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" -SRCREV:gitunpack-enable-recipe = "" - -S = "${WORKDIR}/git" +# Clear the base.bbclass magic srcrev call +fetcher_hashes_dummyfunc[vardepvalue] = "" diff --git a/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.bb b/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.bb index 597c89b199..d9a54690b2 100644 --- a/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.bb +++ b/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.bb @@ -1,5 +1,5 @@ -require gitunpackoffline-fail.bb +require gitunpackoffline.inc TAGVALUE = "2.11" -PV = "0.0+git${SRCPV}" +PV = "0.0+git" diff --git a/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc b/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc new file mode 100644 index 0000000000..602e895199 --- /dev/null +++ b/poky/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc @@ -0,0 +1,16 @@ +SUMMARY = "Test recipe for fetching git submodules" +HOMEPAGE = "https://git.yoctoproject.org/git/matchbox-panel-2" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +INHIBIT_DEFAULT_DEPS = "1" + +TAGVALUE = "2.10" + +# Deliberately have a tag which has to be resolved but ensure do_unpack doesn't access the network again. +SRC_URI = "git://git.yoctoproject.org/git/matchbox-panel-2;branch=master;protocol=https" +SRC_URI:append:gitunpack-enable-recipe = ";tag=${TAGVALUE}" +SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" +SRCREV:gitunpack-enable-recipe = "" + +S = "${WORKDIR}/git" |