diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-29 13:34:24 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-21 11:40:35 +0000 |
commit | ab13c838e4fd97b1e4ddba3828b290c4098a97f6 (patch) | |
tree | 31d9541ba0a581f3c811587e5d5944404e387791 | |
parent | d64469d524cac772f1f0a24ba75f69ef636e2aeb (diff) | |
download | poky-ab13c838e4fd97b1e4ddba3828b290c4098a97f6.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: 87ac0c0a643cca436784dfcd86472adcf2e04130)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5340c0d688036c1be6c938f05d8a8c1e3b49ec38)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/recipetool.py | 6 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/sstatetests.py | 2 | ||||
-rw-r--r-- | scripts/lib/recipetool/create.py | 3 |
5 files changed, 10 insertions, 7 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 433d4b6651..0240589c81 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc | |||
@@ -47,5 +47,5 @@ KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}" | |||
47 | # The CONNECTIVITY_CHECK_URIS are used to test whether we can succesfully | 47 | # The CONNECTIVITY_CHECK_URIS are used to test whether we can succesfully |
48 | # fetch from the network (and warn you if not). To disable the test set | 48 | # fetch from the network (and warn you if not). To disable the test set |
49 | # the variable to be empty. | 49 | # the variable to be empty. |
50 | # Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master | 50 | # Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master;branch=master |
51 | CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" | 51 | CONNECTIVITY_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 3385546e8e..66e326253e 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 9d56e9e1e3..3621492998 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 c46e8ba489..e2fe38be87 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 | ||
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 566c75369a..116bdfd697 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
@@ -389,6 +389,9 @@ def reformat_git_uri(uri): | |||
389 | parms.update({('protocol', 'ssh')}) | 389 | parms.update({('protocol', 'ssh')}) |
390 | elif (scheme == "http" or scheme == 'https' or scheme == 'ssh') and not ('protocol' in parms): | 390 | elif (scheme == "http" or scheme == 'https' or scheme == 'ssh') and not ('protocol' in parms): |
391 | parms.update({('protocol', scheme)}) | 391 | parms.update({('protocol', scheme)}) |
392 | # We assume 'master' branch if not set | ||
393 | if not 'branch' in parms: | ||
394 | parms.update({('branch', 'master')}) | ||
392 | # Always append 'git://' | 395 | # Always append 'git://' |
393 | fUrl = bb.fetch2.encodeurl(('git', host, path, user, pswd, parms)) | 396 | fUrl = bb.fetch2.encodeurl(('git', host, path, user, pswd, parms)) |
394 | return fUrl | 397 | return fUrl |