aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-17 21:33:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-17 21:33:50 +0100
commit4807280ff1a6f78b66f32c45b4d3b20782dd6748 (patch)
treecef1cc856603945fbd46b241bc1669ca72737387
parentac46943d2e0389108b0970bd22f7ab104c528876 (diff)
downloadopenembedded-core-master-next.tar.gz
openembedded-core-master-next.tar.bz2
openembedded-core-master-next.zip
Revert "populate_sysroot experiment"master-next
This reverts commit ac46943d2e0389108b0970bd22f7ab104c528876.
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/classes/native.bbclass1
-rw-r--r--meta/lib/oeqa/selftest/cases/bbtests.py2
3 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index b1abe9e3c6..340ebe7d78 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -344,7 +344,7 @@ base_do_package() {
:
}
-addtask build
+addtask build after do_populate_sysroot
do_build[noexec] = "1"
do_build[recrdeptask] += "do_deploy"
do_build () {
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index c4592d2dc2..76a599bc15 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -195,4 +195,3 @@ USE_NLS = "no"
RECIPERDEPTASK = "do_populate_sysroot"
do_populate_sysroot[rdeptask] = "${RECIPERDEPTASK}"
-addtask build after do_populate_sysroot
diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py
index ec079d61af..8831de6065 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -114,7 +114,7 @@ class BitbakeTests(OESelftestTestCase):
self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe)
result = bitbake('-C compile %s' % test_recipe)
- look_for_tasks = ['do_compile:', 'do_install:', 'do_package:']
+ look_for_tasks = ['do_compile:', 'do_install:', 'do_populate_sysroot:', 'do_package:']
for task in look_for_tasks:
self.assertIn(task, result.output, msg="Couldn't find %s task.")