summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-29 13:34:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-30 18:56:47 +0100
commitdc53fe75cc5ec5f6f2b7e297155fe5778fa46889 (patch)
tree490beafd02cfafb96fd3bb4cd71c0118a8a56b78 /meta
parentddcf16d1f792153f7f7fec4b1dcbc11855b64208 (diff)
downloadpoky-dc53fe75cc5ec5f6f2b7e297155fe5778fa46889.tar.gz
meta/scripts: Manual git url branch additions
Following the scripted conversion adding branches to git:// SRC_URI entries, add the remaining references, mainly in the selftests and recipetool. (From OE-Core rev: 5340c0d688036c1be6c938f05d8a8c1e3b49ec38) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/default-distrovars.inc2
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/recipetool.py6
-rw-r--r--meta/lib/oeqa/selftest/cases/sstatetests.py2
4 files changed, 7 insertions, 7 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index f91df632d5..fb0f1097da 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -53,5 +53,5 @@ KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}"
53# The CONNECTIVITY_CHECK_URIS are used to test whether we can succesfully 53# The CONNECTIVITY_CHECK_URIS are used to test whether we can succesfully
54# fetch from the network (and warn you if not). To disable the test set 54# fetch from the network (and warn you if not). To disable the test set
55# the variable to be empty. 55# the variable to be empty.
56# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master 56# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master;branch=master
57CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" 57CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/"
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index f495e84c79..d2b31af80e 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -340,7 +340,7 @@ class DevtoolAddTests(DevtoolBase):
340 checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263' 340 checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
341 checkvars['S'] = '${WORKDIR}/git' 341 checkvars['S'] = '${WORKDIR}/git'
342 checkvars['PV'] = '0.1+git${SRCPV}' 342 checkvars['PV'] = '0.1+git${SRCPV}'
343 checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https' 343 checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https;branch=master'
344 checkvars['SRCREV'] = srcrev 344 checkvars['SRCREV'] = srcrev
345 checkvars['DEPENDS'] = set(['dbus']) 345 checkvars['DEPENDS'] = set(['dbus'])
346 self._test_recipe_contents(recipefile, checkvars, []) 346 self._test_recipe_contents(recipefile, checkvars, [])
@@ -904,7 +904,7 @@ class DevtoolUpdateTests(DevtoolBase):
904 self._check_repo_status(os.path.dirname(recipefile), expected_status) 904 self._check_repo_status(os.path.dirname(recipefile), expected_status)
905 905
906 result = runCmd('git diff %s' % os.path.basename(recipefile), cwd=os.path.dirname(recipefile)) 906 result = runCmd('git diff %s' % os.path.basename(recipefile), cwd=os.path.dirname(recipefile))
907 addlines = ['SRCREV = ".*"', 'SRC_URI = "git://git.infradead.org/mtd-utils.git"'] 907 addlines = ['SRCREV = ".*"', 'SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master"']
908 srcurilines = src_uri.split() 908 srcurilines = src_uri.split()
909 srcurilines[0] = 'SRC_URI = "' + srcurilines[0] 909 srcurilines[0] = 'SRC_URI = "' + srcurilines[0]
910 srcurilines.append('"') 910 srcurilines.append('"')
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py
index c2a53815d0..8dc00ac10e 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -357,7 +357,7 @@ class RecipetoolTests(RecipetoolBase):
357 tempsrc = os.path.join(self.tempdir, 'srctree') 357 tempsrc = os.path.join(self.tempdir, 'srctree')
358 os.makedirs(tempsrc) 358 os.makedirs(tempsrc)
359 recipefile = os.path.join(self.tempdir, 'libmatchbox.bb') 359 recipefile = os.path.join(self.tempdir, 'libmatchbox.bb')
360 srcuri = 'git://git.yoctoproject.org/libmatchbox' 360 srcuri = 'git://git.yoctoproject.org/libmatchbox;branch=master'
361 result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=9f7cf8895ae2d39c465c04cc78e918c157420269", '-x', tempsrc]) 361 result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=9f7cf8895ae2d39c465c04cc78e918c157420269", '-x', tempsrc])
362 self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output) 362 self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output)
363 checkvars = {} 363 checkvars = {}
@@ -447,7 +447,7 @@ class RecipetoolTests(RecipetoolBase):
447 self.assertTrue(os.path.isfile(recipefile)) 447 self.assertTrue(os.path.isfile(recipefile))
448 checkvars = {} 448 checkvars = {}
449 checkvars['LICENSE'] = set(['Apache-2.0']) 449 checkvars['LICENSE'] = set(['Apache-2.0'])
450 checkvars['SRC_URI'] = 'git://github.com/mesonbuild/meson;protocol=https' 450 checkvars['SRC_URI'] = 'git://github.com/mesonbuild/meson;protocol=https;branch=master'
451 inherits = ['setuptools3'] 451 inherits = ['setuptools3']
452 self._test_recipe_contents(recipefile, checkvars, inherits) 452 self._test_recipe_contents(recipefile, checkvars, inherits)
453 453
@@ -514,7 +514,7 @@ class RecipetoolTests(RecipetoolBase):
514 self.assertTrue(os.path.isfile(recipefile)) 514 self.assertTrue(os.path.isfile(recipefile))
515 checkvars = {} 515 checkvars = {}
516 checkvars['LICENSE'] = set(['GPLv2']) 516 checkvars['LICENSE'] = set(['GPLv2'])
517 checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/matchbox-terminal;protocol=http' 517 checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/matchbox-terminal;protocol=http;branch=master'
518 inherits = ['pkgconfig', 'autotools'] 518 inherits = ['pkgconfig', 'autotools']
519 self._test_recipe_contents(recipefile, checkvars, inherits) 519 self._test_recipe_contents(recipefile, checkvars, inherits)
520 520
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index 3dab607eeb..c5beb4de39 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -39,7 +39,7 @@ class SStateTests(SStateBase):
39 39
40 recipefile = os.path.join(tempdir, "recipes-test", "dbus-wait-test", 'dbus-wait-test_git.bb') 40 recipefile = os.path.join(tempdir, "recipes-test", "dbus-wait-test", 'dbus-wait-test_git.bb')
41 os.makedirs(os.path.dirname(recipefile)) 41 os.makedirs(os.path.dirname(recipefile))
42 srcuri = 'git://' + srcdir + ';protocol=file' 42 srcuri = 'git://' + srcdir + ';protocol=file;branch=master'
43 result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri]) 43 result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri])
44 self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output) 44 self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output)
45 45