mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa: Drop /git/ from our urls

Browse Source 
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.

(From OE-Core rev: 50f40609b27c169e9da1f076172daabbf55732d0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8ac7c0c3493a6141476093bb2c1c79004c55857d)
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Paul Barker <paul@pbarker.dev>
This commit is contained in:
Richard Purdie
2026-04-08 08:13:13 +01:00
committed by Paul Barker
parent f47c0cb3bf
commit 4db556863d
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta-selftest/recipes-test/gitrepotest/gitrepotest.bb
View File

@@ -7,7 +7,7 @@ INHIBIT_DEFAULT_DEPS = "1"
PATCHTOOL="git" 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 \ file://0001-testpatch.patch \
" "

4
meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc
View File

@@ -1,5 +1,5 @@
SUMMARY = "Test recipe for fetching git submodules" 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" LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
@@ -8,7 +8,7 @@ INHIBIT_DEFAULT_DEPS = "1"
TAGVALUE = "2.10" TAGVALUE = "2.10"
# Deliberately have a tag which has to be resolved but ensure do_unpack doesn't access the network again. # 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}" SRC_URI:append:gitunpack-enable-recipe = ";tag=${TAGVALUE}"
SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7"
SRCREV:gitunpack-enable-recipe = "" SRCREV:gitunpack-enable-recipe = ""

6
meta/lib/oeqa/manual/toaster-managed-mode.json
View File

@@ -2176,7 +2176,7 @@
], ],
"execution": { "execution": {
"1": { "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": "" "expected_results": ""
}, },
"2": { "2": {
@@ -2458,7 +2458,7 @@
], ],
"execution": { "execution": {
"1": { "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": "" "expected_results": ""
}, },
"2": { "2": {
@@ -2496,7 +2496,7 @@
], ],
"execution": { "execution": {
"1": { "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": "" "expected_results": ""
}, },
"2": { "2": {

4
meta/lib/oeqa/sdkext/cases/devtool.py
View File

@@ -71,14 +71,14 @@ class DevtoolTest(OESDKExtTestCase):
def test_extend_autotools_recipe_creation(self): def test_extend_autotools_recipe_creation(self):
recipe = "test-dbus-wait" recipe = "test-dbus-wait"
self._run('devtool sdk-install dbus') 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: try:
self._run('devtool build %s' % recipe) self._run('devtool build %s' % recipe)
finally: finally:
self._run('devtool reset %s' % recipe) self._run('devtool reset %s' % recipe)
def test_devtool_kernelmodule(self): 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' recipe = 'kernel-module-hello-world'
self._run('devtool add %s %s' % (recipe, docfile) ) self._run('devtool add %s %s' % (recipe, docfile) )
try: try:

4
meta/lib/oeqa/selftest/cases/devtool.py
View File

@@ -440,7 +440,7 @@ class DevtoolAddTests(DevtoolBase):
pn = 'dbus-wait' pn = 'dbus-wait'
srcrev = '6cc6077a36fe2648a5f993fe7c16c9632f946517' srcrev = '6cc6077a36fe2648a5f993fe7c16c9632f946517'
# We choose an https:// git URL here to check rewriting the URL works # 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 # Force fetching to "noname" subdir so we verify we're picking up the name from autoconf
# instead of the directory name # instead of the directory name
result = runCmd('git clone %s noname' % url, cwd=tempdir) result = runCmd('git clone %s noname' % url, cwd=tempdir)
@@ -467,7 +467,7 @@ class DevtoolAddTests(DevtoolBase):
checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263' checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
checkvars['S'] = '${WORKDIR}/git' checkvars['S'] = '${WORKDIR}/git'
checkvars['PV'] = '0.1+git' 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['SRCREV'] = srcrev
checkvars['DEPENDS'] = set(['dbus']) checkvars['DEPENDS'] = set(['dbus'])
self._test_recipe_contents(recipefile, checkvars, []) self._test_recipe_contents(recipefile, checkvars, [])

2
meta/lib/oeqa/selftest/cases/recipetool.py
View File

@@ -738,7 +738,7 @@ class RecipetoolCreateTests(RecipetoolBase):
self._test_recipe_contents(recipefile, checkvars, []) self._test_recipe_contents(recipefile, checkvars, [])
def test_recipetool_create_git_http(self): 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): def test_recipetool_create_git_srcuri_master(self):
self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=master;protocol=https') self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=master;protocol=https')