diff options
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/recipeutils.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 6 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/recipetool.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/sstatetests.py | 1 |
4 files changed, 5 insertions, 8 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 5a902c23f6..6996e426ec 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py | |||
@@ -24,7 +24,7 @@ from collections import OrderedDict, defaultdict | |||
24 | from bb.utils import vercmp_string | 24 | from bb.utils import vercmp_string |
25 | 25 | ||
26 | # Help us to find places to insert values | 26 | # Help us to find places to insert values |
27 | recipe_progression = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION', 'LICENSE', 'LICENSE_FLAGS', 'LIC_FILES_CHKSUM', 'PROVIDES', 'DEPENDS', 'PR', 'PV', 'SRCREV', 'SRCPV', 'SRC_URI', 'S', 'do_fetch()', 'do_unpack()', 'do_patch()', 'EXTRA_OECONF', 'EXTRA_OECMAKE', 'EXTRA_OESCONS', 'do_configure()', 'EXTRA_OEMAKE', 'do_compile()', 'do_install()', 'do_populate_sysroot()', 'INITSCRIPT', 'USERADD', 'GROUPADD', 'PACKAGES', 'FILES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RPROVIDES', 'RREPLACES', 'RCONFLICTS', 'ALLOW_EMPTY', 'populate_packages()', 'do_package()', 'do_deploy()', 'BBCLASSEXTEND'] | 27 | recipe_progression = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION', 'LICENSE', 'LICENSE_FLAGS', 'LIC_FILES_CHKSUM', 'PROVIDES', 'DEPENDS', 'PR', 'PV', 'SRCREV', 'SRC_URI', 'S', 'do_fetch()', 'do_unpack()', 'do_patch()', 'EXTRA_OECONF', 'EXTRA_OECMAKE', 'EXTRA_OESCONS', 'do_configure()', 'EXTRA_OEMAKE', 'do_compile()', 'do_install()', 'do_populate_sysroot()', 'INITSCRIPT', 'USERADD', 'GROUPADD', 'PACKAGES', 'FILES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RPROVIDES', 'RREPLACES', 'RCONFLICTS', 'ALLOW_EMPTY', 'populate_packages()', 'do_package()', 'do_deploy()', 'BBCLASSEXTEND'] |
28 | # Variables that sometimes are a bit long but shouldn't be wrapped | 28 | # Variables that sometimes are a bit long but shouldn't be wrapped |
29 | nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER', r'SRC_URI\[(.+\.)?md5sum\]', r'SRC_URI\[(.+\.)?sha256sum\]'] | 29 | nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER', r'SRC_URI\[(.+\.)?md5sum\]', r'SRC_URI\[(.+\.)?sha256sum\]'] |
30 | list_vars = ['SRC_URI', 'LIC_FILES_CHKSUM'] | 30 | list_vars = ['SRC_URI', 'LIC_FILES_CHKSUM'] |
@@ -421,8 +421,6 @@ def copy_recipe_files(d, tgt_dir, whole_dir=False, download=True, all_variants=F | |||
421 | # Ensure we handle class-target if we're dealing with one of the variants | 421 | # Ensure we handle class-target if we're dealing with one of the variants |
422 | variants.append('target') | 422 | variants.append('target') |
423 | for variant in variants: | 423 | for variant in variants: |
424 | if variant.startswith("devupstream"): | ||
425 | localdata.setVar('SRCPV', 'git') | ||
426 | localdata.setVar('CLASSOVERRIDE', 'class-%s' % variant) | 424 | localdata.setVar('CLASSOVERRIDE', 'class-%s' % variant) |
427 | fetch_urls(localdata) | 425 | fetch_urls(localdata) |
428 | 426 | ||
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 14a80d5ff4..a2b77e528d 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
@@ -433,7 +433,7 @@ class DevtoolAddTests(DevtoolBase): | |||
433 | checkvars['LICENSE'] = 'GPL-2.0-only' | 433 | checkvars['LICENSE'] = 'GPL-2.0-only' |
434 | checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263' | 434 | checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263' |
435 | checkvars['S'] = '${WORKDIR}/git' | 435 | checkvars['S'] = '${WORKDIR}/git' |
436 | checkvars['PV'] = '0.1+git${SRCPV}' | 436 | checkvars['PV'] = '0.1+git' |
437 | checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https;branch=master' | 437 | checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https;branch=master' |
438 | checkvars['SRCREV'] = srcrev | 438 | checkvars['SRCREV'] = srcrev |
439 | checkvars['DEPENDS'] = set(['dbus']) | 439 | checkvars['DEPENDS'] = set(['dbus']) |
@@ -572,7 +572,7 @@ class DevtoolAddTests(DevtoolBase): | |||
572 | self.assertIn('_git.bb', recipefile, 'Recipe file incorrectly named') | 572 | self.assertIn('_git.bb', recipefile, 'Recipe file incorrectly named') |
573 | checkvars = {} | 573 | checkvars = {} |
574 | checkvars['S'] = '${WORKDIR}/git' | 574 | checkvars['S'] = '${WORKDIR}/git' |
575 | checkvars['PV'] = '1.0+git${SRCPV}' | 575 | checkvars['PV'] = '1.0+git' |
576 | checkvars['SRC_URI'] = url_branch | 576 | checkvars['SRC_URI'] = url_branch |
577 | checkvars['SRCREV'] = '${AUTOREV}' | 577 | checkvars['SRCREV'] = '${AUTOREV}' |
578 | self._test_recipe_contents(recipefile, checkvars, []) | 578 | self._test_recipe_contents(recipefile, checkvars, []) |
@@ -591,7 +591,7 @@ class DevtoolAddTests(DevtoolBase): | |||
591 | self.assertIn('_git.bb', recipefile, 'Recipe file incorrectly named') | 591 | self.assertIn('_git.bb', recipefile, 'Recipe file incorrectly named') |
592 | checkvars = {} | 592 | checkvars = {} |
593 | checkvars['S'] = '${WORKDIR}/git' | 593 | checkvars['S'] = '${WORKDIR}/git' |
594 | checkvars['PV'] = '1.5+git${SRCPV}' | 594 | checkvars['PV'] = '1.5+git' |
595 | checkvars['SRC_URI'] = url_branch | 595 | checkvars['SRC_URI'] = url_branch |
596 | checkvars['SRCREV'] = checkrev | 596 | checkvars['SRCREV'] = checkrev |
597 | self._test_recipe_contents(recipefile, checkvars, []) | 597 | 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 a5c0f7164a..48661bee6f 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py | |||
@@ -368,7 +368,7 @@ class RecipetoolCreateTests(RecipetoolBase): | |||
368 | checkvars['LICENSE'] = 'LGPL-2.1-only' | 368 | checkvars['LICENSE'] = 'LGPL-2.1-only' |
369 | checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34' | 369 | checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34' |
370 | checkvars['S'] = '${WORKDIR}/git' | 370 | checkvars['S'] = '${WORKDIR}/git' |
371 | checkvars['PV'] = '1.11+git${SRCPV}' | 371 | checkvars['PV'] = '1.11+git' |
372 | checkvars['SRC_URI'] = srcuri + ';branch=master' | 372 | checkvars['SRC_URI'] = srcuri + ';branch=master' |
373 | checkvars['DEPENDS'] = set(['libcheck', 'libjpeg-turbo', 'libpng', 'libx11', 'libxext', 'pango']) | 373 | checkvars['DEPENDS'] = set(['libcheck', 'libjpeg-turbo', 'libpng', 'libx11', 'libxext', 'pango']) |
374 | inherits = ['autotools', 'pkgconfig'] | 374 | inherits = ['autotools', 'pkgconfig'] |
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 3fa3038218..bdad9088d3 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py | |||
@@ -188,7 +188,6 @@ class SStateBase(OESelftestTestCase): | |||
188 | class SStateTests(SStateBase): | 188 | class SStateTests(SStateBase): |
189 | def test_autorev_sstate_works(self): | 189 | def test_autorev_sstate_works(self): |
190 | # Test that a git repository which changes is correctly handled by SRCREV = ${AUTOREV} | 190 | # Test that a git repository which changes is correctly handled by SRCREV = ${AUTOREV} |
191 | # when PV does not contain SRCPV | ||
192 | 191 | ||
193 | tempdir = tempfile.mkdtemp(prefix='sstate_autorev') | 192 | tempdir = tempfile.mkdtemp(prefix='sstate_autorev') |
194 | tempdldir = tempfile.mkdtemp(prefix='sstate_autorev_dldir') | 193 | tempdldir = tempfile.mkdtemp(prefix='sstate_autorev_dldir') |