From: Richard Purdie Date: Wed, 8 Apr 2026 07:13:13 +0000 (+0100) Subject: oeqa: Drop /git/ from our urls X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=HEAD;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git oeqa: Drop /git/ from our urls Using /git/ in our urls is rather old school and not the preferred format now. Update the urls to the preferred form even if the other ones still work. Signed-off-by: Richard Purdie --- diff --git a/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb b/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb index 756c01cb099..f535554cbbe 100644 --- a/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb +++ b/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb @@ -7,7 +7,7 @@ INHIBIT_DEFAULT_DEPS = "1" PATCHTOOL = "git" -SRC_URI = "git://git.yoctoproject.org/git/matchbox-panel-2;branch=master;protocol=https \ +SRC_URI = "git://git.yoctoproject.org/matchbox-panel-2;branch=master;protocol=https \ file://0001-testpatch.patch \ " diff --git a/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc b/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc index 59b383800cd..f828f3bac6b 100644 --- a/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc +++ b/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc @@ -1,5 +1,5 @@ SUMMARY = "Test recipe for fetching git submodules" -HOMEPAGE = "https://git.yoctoproject.org/git/matchbox-panel-2" +HOMEPAGE = "https://git.yoctoproject.org/matchbox-panel-2" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" @@ -8,7 +8,7 @@ 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 = "git://git.yoctoproject.org/matchbox-panel-2;branch=master;protocol=https" SRC_URI:append:gitunpack-enable-recipe = ";tag=${TAGVALUE}" SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" SRCREV:gitunpack-enable-recipe = "" diff --git a/meta/lib/oeqa/manual/toaster-managed-mode.json b/meta/lib/oeqa/manual/toaster-managed-mode.json index 1a71985c3c1..d1d500864e5 100644 --- a/meta/lib/oeqa/manual/toaster-managed-mode.json +++ b/meta/lib/oeqa/manual/toaster-managed-mode.json @@ -2176,7 +2176,7 @@ ], "execution": { "1": { - "action": "Clone the poky environment git clone http://git.yoctoproject.org/git/poky", + "action": "Clone the poky environment git clone http://git.yoctoproject.org/poky", "expected_results": "" }, "2": { @@ -2458,7 +2458,7 @@ ], "execution": { "1": { - "action": "Clone the poky environment git clone http://git.yoctoproject.org/git/poky", + "action": "Clone the poky environment git clone http://git.yoctoproject.org/poky", "expected_results": "" }, "2": { @@ -2496,7 +2496,7 @@ ], "execution": { "1": { - "action": "Clone the poky environment git clone http://git.yoctoproject.org/git/poky\n", + "action": "Clone the poky environment git clone http://git.yoctoproject.org/poky\n", "expected_results": "" }, "2": { diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py index d0746e68eba..a28d5b020c5 100644 --- a/meta/lib/oeqa/sdkext/cases/devtool.py +++ b/meta/lib/oeqa/sdkext/cases/devtool.py @@ -71,14 +71,14 @@ class DevtoolTest(OESDKExtTestCase): def test_extend_autotools_recipe_creation(self): recipe = "test-dbus-wait" self._run('devtool sdk-install dbus') - self._run('devtool add %s https://git.yoctoproject.org/git/dbus-wait' % (recipe) ) + self._run('devtool add %s https://git.yoctoproject.org/dbus-wait' % (recipe) ) try: self._run('devtool build %s' % recipe) finally: self._run('devtool reset %s' % recipe) def test_devtool_kernelmodule(self): - docfile = 'https://git.yoctoproject.org/git/kernel-module-hello-world' + docfile = 'https://git.yoctoproject.org/kernel-module-hello-world' recipe = 'kernel-module-hello-world' self._run('devtool add %s %s' % (recipe, docfile) ) try: diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 4aafb5a4636..b9670f2cec1 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -436,7 +436,7 @@ class DevtoolAddTests(DevtoolBase): pn = 'dbus-wait' srcrev = '6cc6077a36fe2648a5f993fe7c16c9632f946517' # We choose an https:// git URL here to check rewriting the URL works - url = 'https://git.yoctoproject.org/git/dbus-wait' + url = 'https://git.yoctoproject.org/dbus-wait' # Force fetching to "noname" subdir so we verify we're picking up the name from autoconf # instead of the directory name result = runCmd('git clone %s noname' % url, cwd=tempdir) @@ -463,7 +463,7 @@ class DevtoolAddTests(DevtoolBase): checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263' checkvars['S'] = None checkvars['PV'] = '0.1+git' - checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https;branch=master' + checkvars['SRC_URI'] = 'git://git.yoctoproject.org/dbus-wait;protocol=https;branch=master' checkvars['SRCREV'] = srcrev checkvars['DEPENDS'] = set(['dbus']) self._test_recipe_contents(recipefile, checkvars, []) diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index e23055ded18..03697826839 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -783,7 +783,7 @@ class RecipetoolCreateTests(RecipetoolBase): self._test_recipe_contents(recipefile, checkvars, []) def test_recipetool_create_git_http(self): - self._test_recipetool_create_git('http://git.yoctoproject.org/git/matchbox-keyboard') + self._test_recipetool_create_git('http://git.yoctoproject.org/matchbox-keyboard') def test_recipetool_create_git_srcuri_master(self): self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=master;protocol=https')